From bb0bf41cab205d7bc43be22b22846747b7197e25 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Tue, 4 Dec 2018 00:36:53 +0100 Subject: [PATCH] Use ClassMixin the right way in typing --- jedi/evaluate/context/typing.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/jedi/evaluate/context/typing.py b/jedi/evaluate/context/typing.py index d67fa69d..317450f7 100644 --- a/jedi/evaluate/context/typing.py +++ b/jedi/evaluate/context/typing.py @@ -197,24 +197,21 @@ class TypingContext(_BaseTypingContext): ) -class TypingClassMixin(ClassMixin): - @property - def name(self): - # In this case the tree_node is already a name and not a real class. - # (see typeshed definitions). - return ContextName(self, self.tree_node) - +class _TypingClassMixin(object): def py__bases__(self): return [LazyKnownContexts( self.evaluator.builtins_module.py__getattribute__('object') )] + def py__mro__(self): + return [self] -class TypingClassContextWithIndex(TypingClassMixin, TypingContextWithIndex): + +class TypingClassContextWithIndex(_TypingClassMixin, TypingContextWithIndex, ClassMixin): pass -class TypingClassContext(TypingClassMixin, TypingContext): +class TypingClassContext(_TypingClassMixin, TypingContext, ClassMixin): index_class = TypingClassContextWithIndex