From df697cfb032f1af0f3a499c2187b458fbe92cc7c Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sun, 8 Dec 2019 19:00:26 +0100 Subject: [PATCH] Make AbstractAnnotatedClass private --- jedi/inference/gradual/annotation.py | 4 ++-- jedi/inference/gradual/base.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jedi/inference/gradual/annotation.py b/jedi/inference/gradual/annotation.py index e9ae406b..1e19ff57 100644 --- a/jedi/inference/gradual/annotation.py +++ b/jedi/inference/gradual/annotation.py @@ -13,7 +13,7 @@ from jedi._compatibility import force_unicode, Parameter from jedi.inference.cache import inference_state_method_cache from jedi.inference.base_value import ValueSet, NO_VALUES from jedi.inference.gradual.base import LazyGenericClass, \ - AbstractAnnotatedClass, GenericClass + DefineGenericBase, GenericClass from jedi.inference.gradual.typing import TypingClassValueWithIndex from jedi.inference.gradual.type_var import TypeVar from jedi.inference.helpers import is_string @@ -229,7 +229,7 @@ def infer_return_types(function, arguments): return ValueSet.from_sets( ann.define_generics(type_var_dict) - if isinstance(ann, (AbstractAnnotatedClass, TypeVar)) else ValueSet({ann}) + if isinstance(ann, (DefineGenericBase, TypeVar)) else ValueSet({ann}) for ann in annotation_values ).execute_annotation() diff --git a/jedi/inference/gradual/base.py b/jedi/inference/gradual/base.py index 6ea65342..52b97e10 100644 --- a/jedi/inference/gradual/base.py +++ b/jedi/inference/gradual/base.py @@ -153,7 +153,7 @@ class DefineGenericBase(ValueWrapper): for generic_set in self.get_generics(): values = NO_VALUES for generic in generic_set: - if isinstance(generic, (AbstractAnnotatedClass, TypeVar)): + if isinstance(generic, (_AbstractAnnotatedClass, TypeVar)): result = generic.define_generics(type_var_dict) values |= result if result != ValueSet({generic}): @@ -206,12 +206,12 @@ class DefineGenericBase(ValueWrapper): ) -class AbstractAnnotatedClass(ClassMixin, DefineGenericBase): +class _AbstractAnnotatedClass(ClassMixin, DefineGenericBase): def get_type_var_filter(self): return TypeVarFilter(self.get_generics(), self.list_type_vars()) def py__call__(self, arguments): - instance, = super(AbstractAnnotatedClass, self).py__call__(arguments) + instance, = super(_AbstractAnnotatedClass, self).py__call__(arguments) return ValueSet([InstanceWrapper(instance)]) def _as_context(self): @@ -223,7 +223,7 @@ class AbstractAnnotatedClass(ClassMixin, DefineGenericBase): yield LazyAnnotatedBaseClass(self, base) -class LazyGenericClass(AbstractAnnotatedClass): +class LazyGenericClass(_AbstractAnnotatedClass): def __init__(self, class_value, index_value, value_of_index): super(LazyGenericClass, self).__init__(class_value) self._index_value = index_value @@ -234,7 +234,7 @@ class LazyGenericClass(AbstractAnnotatedClass): return list(iter_over_arguments(self._index_value, self._context_of_index)) -class GenericClass(AbstractAnnotatedClass): +class GenericClass(_AbstractAnnotatedClass): def __init__(self, class_value, generics): super(GenericClass, self).__init__(class_value) self._generics = generics @@ -251,7 +251,7 @@ class LazyAnnotatedBaseClass(object): @iterator_to_value_set def infer(self): for base in self._lazy_base_class.infer(): - if isinstance(base, AbstractAnnotatedClass): + if isinstance(base, _AbstractAnnotatedClass): # Here we have to recalculate the given types. yield GenericClass.create_cached( base.inference_state,