diff --git a/jedi/inference/arguments.py b/jedi/inference/arguments.py index f1e15c5c..865ae855 100644 --- a/jedi/inference/arguments.py +++ b/jedi/inference/arguments.py @@ -4,7 +4,6 @@ from parso.python import tree from jedi._compatibility import zip_longest from jedi import debug -from jedi.cache import memoize_method from jedi.inference.utils import PushBackIterator from jedi.inference import analysis from jedi.inference.lazy_value import LazyKnownValue, LazyKnownValues, \ @@ -13,7 +12,6 @@ from jedi.inference.names import ParamName, TreeNameDefinition, SimpleParamName from jedi.inference.base_value import NO_VALUES, ValueSet, ContextualizedNode from jedi.inference.value import iterable from jedi.inference.cache import inference_state_as_method_param_cache -from jedi.inference.param import get_executed_param_names_and_issues def try_iter_content(types, depth=0): @@ -145,9 +143,6 @@ class _AbstractArgumentsMixin(object): def unpack(self, funcdef=None): raise NotImplementedError - def get_executed_param_names_and_issues(self, function_value): - return get_executed_param_names_and_issues(function_value, self) - def get_calling_nodes(self): return [] diff --git a/jedi/inference/gradual/annotation.py b/jedi/inference/gradual/annotation.py index 6b11144b..7f01bb18 100644 --- a/jedi/inference/gradual/annotation.py +++ b/jedi/inference/gradual/annotation.py @@ -17,6 +17,7 @@ from jedi.inference.gradual.typing import TypeVar, LazyGenericClass, \ from jedi.inference.gradual.typing import GenericClass from jedi.inference.helpers import is_string from jedi.inference.compiled import builtin_from_name +from jedi.inference.param import get_executed_param_names_and_issues from jedi import debug from jedi import parser_utils @@ -246,7 +247,7 @@ def infer_type_vars_for_execution(function, arguments, annotation_dict): context = function.get_default_param_context() annotation_variable_results = {} - executed_param_names, _ = arguments.get_executed_param_names_and_issues(function) + executed_param_names, _ = get_executed_param_names_and_issues(function, arguments) for executed_param_name in executed_param_names: try: annotation_node = annotation_dict[executed_param_name.string_name] diff --git a/jedi/inference/names.py b/jedi/inference/names.py index f4eb0c23..7e8704b1 100644 --- a/jedi/inference/names.py +++ b/jedi/inference/names.py @@ -350,7 +350,8 @@ class ParamName(X): return self.get_executed_param_name().infer() def get_executed_param_name(self): - params_names, _ = self.arguments.get_executed_param_names_and_issues(self.function_value) + from jedi.inference.param import get_executed_param_names_and_issues + params_names, _ = get_executed_param_names_and_issues(self.function_value, self.arguments) return params_names[self._get_param_node().position_index] diff --git a/jedi/inference/value/instance.py b/jedi/inference/value/instance.py index 60058e17..b908aee2 100644 --- a/jedi/inference/value/instance.py +++ b/jedi/inference/value/instance.py @@ -585,6 +585,3 @@ class InstanceArguments(TreeArgumentsWrapper): yield None, LazyKnownValue(self.instance) for values in self._wrapped_arguments.unpack(func): yield values - - def get_executed_param_names_and_issues(self, function_value): - return super(InstanceArguments, self).get_executed_param_names_and_issues(function_value)