VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Make AbstractAnnotatedClass private

Browse Source
This commit is contained in:
Dave Halter
2019-12-08 19:00:26 +01:00
parent fd054d1add
commit df697cfb03
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/inference/gradual/annotation.py
View File

@@ -13,7 +13,7 @@ from jedi._compatibility import force_unicode, Parameter
from jedi.inference.cache import inference_state_method_cache from jedi.inference.cache import inference_state_method_cache
from jedi.inference.base_value import ValueSet, NO_VALUES from jedi.inference.base_value import ValueSet, NO_VALUES
from jedi.inference.gradual.base import LazyGenericClass, \ from jedi.inference.gradual.base import LazyGenericClass, \
AbstractAnnotatedClass, GenericClass DefineGenericBase, GenericClass
from jedi.inference.gradual.typing import TypingClassValueWithIndex from jedi.inference.gradual.typing import TypingClassValueWithIndex
from jedi.inference.gradual.type_var import TypeVar from jedi.inference.gradual.type_var import TypeVar
from jedi.inference.helpers import is_string from jedi.inference.helpers import is_string
@@ -229,7 +229,7 @@ def infer_return_types(function, arguments):
return ValueSet.from_sets( return ValueSet.from_sets(
ann.define_generics(type_var_dict) 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 for ann in annotation_values
).execute_annotation() ).execute_annotation()

12
jedi/inference/gradual/base.py
View File

@@ -153,7 +153,7 @@ class DefineGenericBase(ValueWrapper):
for generic_set in self.get_generics(): for generic_set in self.get_generics():
values = NO_VALUES values = NO_VALUES
for generic in generic_set: for generic in generic_set:
if isinstance(generic, (AbstractAnnotatedClass, TypeVar)): if isinstance(generic, (_AbstractAnnotatedClass, TypeVar)):
result = generic.define_generics(type_var_dict) result = generic.define_generics(type_var_dict)
values |= result values |= result
if result != ValueSet({generic}): 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): def get_type_var_filter(self):
return TypeVarFilter(self.get_generics(), self.list_type_vars()) return TypeVarFilter(self.get_generics(), self.list_type_vars())
def py__call__(self, arguments): def py__call__(self, arguments):
instance, = super(AbstractAnnotatedClass, self).py__call__(arguments) instance, = super(_AbstractAnnotatedClass, self).py__call__(arguments)
return ValueSet([InstanceWrapper(instance)]) return ValueSet([InstanceWrapper(instance)])
def _as_context(self): def _as_context(self):
@@ -223,7 +223,7 @@ class AbstractAnnotatedClass(ClassMixin, DefineGenericBase):
yield LazyAnnotatedBaseClass(self, base) yield LazyAnnotatedBaseClass(self, base)
class LazyGenericClass(AbstractAnnotatedClass): class LazyGenericClass(_AbstractAnnotatedClass):
def __init__(self, class_value, index_value, value_of_index): def __init__(self, class_value, index_value, value_of_index):
super(LazyGenericClass, self).__init__(class_value) super(LazyGenericClass, self).__init__(class_value)
self._index_value = index_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)) return list(iter_over_arguments(self._index_value, self._context_of_index))
class GenericClass(AbstractAnnotatedClass): class GenericClass(_AbstractAnnotatedClass):
def __init__(self, class_value, generics): def __init__(self, class_value, generics):
super(GenericClass, self).__init__(class_value) super(GenericClass, self).__init__(class_value)
self._generics = generics self._generics = generics
@@ -251,7 +251,7 @@ class LazyAnnotatedBaseClass(object):
@iterator_to_value_set @iterator_to_value_set
def infer(self): def infer(self):
for base in self._lazy_base_class.infer(): for base in self._lazy_base_class.infer():
if isinstance(base, AbstractAnnotatedClass): if isinstance(base, _AbstractAnnotatedClass):
# Here we have to recalculate the given types. # Here we have to recalculate the given types.
yield GenericClass.create_cached( yield GenericClass.create_cached(
base.inference_state, base.inference_state,