From a67861a32002c036ac834441c2740d1f8f66b910 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Tue, 3 Sep 2019 00:47:10 +0200 Subject: [PATCH] Avoid using arguments.get_executed_param_names_and_issues --- jedi/inference/dynamic_params.py | 6 +++--- jedi/inference/param.py | 4 ++++ jedi/inference/signature.py | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jedi/inference/dynamic_params.py b/jedi/inference/dynamic_params.py index c8e11d70..cbc031a4 100644 --- a/jedi/inference/dynamic_params.py +++ b/jedi/inference/dynamic_params.py @@ -19,13 +19,13 @@ It works as follows: from jedi import settings from jedi import debug +from jedi.parser_utils import get_parent_scope from jedi.inference.cache import inference_state_function_cache from jedi.inference import imports from jedi.inference.arguments import TreeArguments -from jedi.inference.param import create_default_params +from jedi.inference.param import create_default_params, get_executed_param_names from jedi.inference.helpers import is_stdlib_path from jedi.inference.utils import to_list -from jedi.parser_utils import get_parent_scope from jedi.inference.value import instance from jedi.inference.base_value import ValueSet, NO_VALUES from jedi.inference import recursion @@ -100,7 +100,7 @@ def search_param_names(inference_state, function_value, funcdef): ) if arguments_list: zipped_param_names = zip(*list( - arguments.get_executed_param_names_and_issues(function_value)[0] + get_executed_param_names(function_value, arguments)[0] for arguments in arguments_list )) params = [DynamicExecutedParamName(executed_param_names) diff --git a/jedi/inference/param.py b/jedi/inference/param.py index 3a8a3b5b..58577e15 100644 --- a/jedi/inference/param.py +++ b/jedi/inference/param.py @@ -205,6 +205,10 @@ def get_executed_param_names_and_issues(function_value, arguments): return result_params, issues +def get_executed_param_names(function_value, arguments): + return get_executed_param_names_and_issues(function_value, arguments) + + def _error_argument_count(funcdef, actual_count): params = funcdef.get_params() default_arguments = sum(1 for p in params if p.default or p.star_count) diff --git a/jedi/inference/signature.py b/jedi/inference/signature.py index ef9533dc..852122d0 100644 --- a/jedi/inference/signature.py +++ b/jedi/inference/signature.py @@ -94,8 +94,9 @@ class TreeSignature(AbstractSignature): return params def matches_signature(self, arguments): + from jedi.inference.param import get_executed_param_names_and_issues executed_param_names, issues = \ - arguments.get_executed_param_names_and_issues(self._function_value) + get_executed_param_names_and_issues(self._function_value, arguments) if issues: return False