Merge branch 'master' into refactor

jedi/inference/compiled/access.py

@@ -484,6 +484,11 @@ class DirectObjectAccess(object):
     def needs_type_completions(self):
         return inspect.isclass(self._obj) and self._obj != type
 
+    def _annotation_to_str(self, annotation):
+        if isinstance(annotation, type):
+            return str(annotation.__name__)
+        return str(annotation)
+
     def get_signature_params(self):
         return [
             SignatureParam(
@@ -493,7 +498,7 @@ class DirectObjectAccess(object):
                 default_string=repr(p.default),
                 has_annotation=p.annotation is not p.empty,
                 annotation=self._create_access_path(p.annotation),
-                annotation_string=str(p.annotation),
+                annotation_string=self._annotation_to_str(p.annotation),
                 kind_name=str(p.kind)
             ) for p in self._get_signature().parameters.values()
         ]

jedi/inference/compiled/getattr_static.py

@@ -6,6 +6,7 @@ information returned to enable Jedi to make decisions.
 
 import types
 
+from jedi import debug
 from jedi._compatibility import py_version
 
 _sentinel = object()
@@ -54,7 +55,14 @@ def _shadowed_dict_newstyle(klass):
 
 
 def _static_getmro_newstyle(klass):
-    return type.__dict__['__mro__'].__get__(klass)
+    mro = type.__dict__['__mro__'].__get__(klass)
+    if not isinstance(mro, (tuple, list)):
+        # There are unfortunately no tests for this, I was not able to
+        # reproduce this in pure Python. However should still solve the issue
+        # raised in GH #1517.
+        debug.warning('mro of %s returned %s, should be a tuple' % (klass, mro))
+        return ()
+    return mro
 
 
 if py_version >= 30:

jedi/inference/compiled/subprocess/__init__.py

@@ -297,7 +297,7 @@ class Listener(object):
         try:
             inference_state = self._inference_states[inference_state_id]
         except KeyError:
-            from jedi.api.environment import InterpreterEnvironment
+            from jedi import InterpreterEnvironment
             inference_state = InferenceState(
                 # The project is not actually needed. Nothing should need to
                 # access it.