From d0270b5e594998f6ffc394dbe4c74f412c4fbed6 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sun, 10 May 2020 03:07:40 +0200 Subject: [PATCH] DefineGenericBase -> DefineGenericBaseClass --- jedi/inference/gradual/annotation.py | 8 ++++---- jedi/inference/gradual/base.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jedi/inference/gradual/annotation.py b/jedi/inference/gradual/annotation.py index 60eb06bd..7311bfb5 100644 --- a/jedi/inference/gradual/annotation.py +++ b/jedi/inference/gradual/annotation.py @@ -12,7 +12,7 @@ from parso import ParserSyntaxError, parse 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 DefineGenericBase, GenericClass +from jedi.inference.gradual.base import DefineGenericBaseClass, GenericClass from jedi.inference.gradual.generics import TupleGenericManager 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, (DefineGenericBase, TypeVar)) else ValueSet({ann}) + if isinstance(ann, (DefineGenericBaseClass, TypeVar)) else ValueSet({ann}) for ann in annotation_values ).execute_annotation() @@ -281,7 +281,7 @@ def infer_return_for_callable(arguments, param_values, result_values): return ValueSet.from_sets( v.define_generics(all_type_vars) - if isinstance(v, (DefineGenericBase, TypeVar)) else ValueSet({v}) + if isinstance(v, (DefineGenericBaseClass, TypeVar)) else ValueSet({v}) for v in result_values ).execute_annotation() @@ -350,7 +350,7 @@ def merge_pairwise_generics(annotation_value, annotated_argument_class): type_var_dict = {} - if not isinstance(annotated_argument_class, DefineGenericBase): + if not isinstance(annotated_argument_class, DefineGenericBaseClass): return type_var_dict annotation_generics = annotation_value.get_generics() diff --git a/jedi/inference/gradual/base.py b/jedi/inference/gradual/base.py index a532d081..e33aa63a 100644 --- a/jedi/inference/gradual/base.py +++ b/jedi/inference/gradual/base.py @@ -81,7 +81,7 @@ class _AnnotatedClassContext(ClassContext): yield self._value.get_type_var_filter() -class DefineGenericBase(LazyValueWrapper): +class DefineGenericBaseClass(LazyValueWrapper): def __init__(self, generics_manager): self._generics_manager = generics_manager @@ -99,7 +99,7 @@ class DefineGenericBase(LazyValueWrapper): for generic_set in self.get_generics(): values = NO_VALUES for generic in generic_set: - if isinstance(generic, (DefineGenericBase, TypeVar)): + if isinstance(generic, (DefineGenericBaseClass, TypeVar)): result = generic.define_generics(type_var_dict) values |= result if result != ValueSet({generic}): @@ -119,7 +119,7 @@ class DefineGenericBase(LazyValueWrapper): )]) def is_same_class(self, other): - if not isinstance(other, DefineGenericBase): + if not isinstance(other, DefineGenericBaseClass): return False if self.tree_node != other.tree_node: @@ -151,7 +151,7 @@ class DefineGenericBase(LazyValueWrapper): ) -class GenericClass(ClassMixin, DefineGenericBase): +class GenericClass(ClassMixin, DefineGenericBaseClass): """ A class that is defined with generics, might be something simple like: @@ -362,7 +362,7 @@ class BaseTypingValue(LazyValueWrapper): return '%s(%s)' % (self.__class__.__name__, self._tree_name.value) -class BaseTypingClassWithGenerics(DefineGenericBase): +class BaseTypingClassWithGenerics(DefineGenericBaseClass): def __init__(self, parent_context, tree_name, generics_manager): super(BaseTypingClassWithGenerics, self).__init__(generics_manager) self.inference_state = parent_context.inference_state