Fix a few of the issues with compiled classes and typeshed and docs

2018-11-14 19:19:56 +01:00
parent 986c69abea
commit d5d7679120
2 changed files with 25 additions and 8 deletions
@@ -16,7 +16,7 @@ from jedi.evaluate.context.function import FunctionMixin
 from jedi.evaluate.context.klass import ClassMixin
 from jedi.evaluate.context.typing import TypingModuleFilterWrapper, \
    TypingModuleName
-from jedi.evaluate.compiled.context import CompiledName
+from jedi.evaluate.compiled.context import CompiledName, CompiledObject
 from jedi.evaluate.utils import to_list


@@ -212,6 +212,16 @@ class NameWithStubMixin(object):
                        actual_context,
                        stub_context,
                    )
+                elif isinstance(stub_context, VersionInfo):
+                    # TODO needed?
+                    yield stub_context
+                elif isinstance(actual_context, CompiledObject):
+                    if actual_context.is_class():
+                        yield CompiledStubClass.create_cached(
+                            stub_context.evaluator, stub_context, actual_context)
+                    else:
+                        yield _StubContextWithCompiled.create_cached(
+                            stub_context.evaluator, stub_context, actual_context)
                else:
                    yield stub_context

@@ -467,11 +477,7 @@ class StubOnlyClass(_StubOnlyContext, ClassMixin, ContextWrapper):
    pass


-class _StubContextWithCompiled(ContextWrapper):
-    def __init__(self, stub_context, compiled_context):
-        super(_StubContextWithCompiled, self).__init__(stub_context)
-        self.compiled_context = compiled_context
-
+class _StubContextMixin(object):
    def py__doc__(self, include_call_signature=False):
        doc = self.compiled_context.py__doc__()
        if include_call_signature:
@@ -481,6 +487,16 @@ class _StubContextWithCompiled(ContextWrapper):
        return doc


+class _StubContextWithCompiled(_StubContextMixin, ContextWrapper):
+    def __init__(self, stub_context, compiled_context):
+        super(_StubContextWithCompiled, self).__init__(stub_context)
+        self.compiled_context = compiled_context
+
+
+class CompiledStubClass(_StubContextWithCompiled, ClassMixin):
+    pass
+
+
 class TypingModuleWrapper(StubOnlyModuleContext):
    # TODO should use this instead of the isinstance check
    def get_filterss(self, *args, **kwargs):