diff --git a/jedi/evaluate/arguments.py b/jedi/evaluate/arguments.py index d40d1ccc..b7a9c8eb 100644 --- a/jedi/evaluate/arguments.py +++ b/jedi/evaluate/arguments.py @@ -174,7 +174,7 @@ class TreeArguments(AbstractArguments): return '<%s: %s>' % (self.__class__.__name__, self.argument_node) def get_calling_nodes(self): - from jedi.evaluate.dynamic import MergedExecutedParams + from jedi.evaluate.dynamic import DynamicExecutedParams old_arguments_list = [] arguments = self @@ -193,7 +193,7 @@ class TreeArguments(AbstractArguments): if not isinstance(names[0], ParamName): break param = names[0].get_param() - if isinstance(param, MergedExecutedParams): + if isinstance(param, DynamicExecutedParams): # For dynamic searches we don't even want to see errors. return [] if not isinstance(param, ExecutedParam): diff --git a/jedi/evaluate/dynamic.py b/jedi/evaluate/dynamic.py index f4b016fd..0fd65525 100644 --- a/jedi/evaluate/dynamic.py +++ b/jedi/evaluate/dynamic.py @@ -35,7 +35,7 @@ from jedi.evaluate import recursion MAX_PARAM_SEARCHES = 20 -class MergedExecutedParams(object): +class DynamicExecutedParams(object): """ Simulates being a parameter while actually just being multiple params. """ @@ -102,7 +102,7 @@ def search_params(evaluator, execution_context, funcdef): function_execution.get_params() for function_execution in function_executions )) - params = [MergedExecutedParams(evaluator, executed_params) for executed_params in zipped_params] + params = [DynamicExecutedParams(evaluator, executed_params) for executed_params in zipped_params] # Evaluate the ExecutedParams to types. else: return create_default_params(execution_context, funcdef)