diff --git a/jedi/evaluate/arguments.py b/jedi/evaluate/arguments.py index b7a9c8eb..075ce50a 100644 --- a/jedi/evaluate/arguments.py +++ b/jedi/evaluate/arguments.py @@ -8,7 +8,7 @@ from jedi.evaluate.lazy_context import LazyKnownContext, LazyKnownContexts, \ from jedi.evaluate.filters import ParamName from jedi.evaluate.base_context import NO_CONTEXTS from jedi.evaluate.context import iterable -from jedi.evaluate.param import get_params, ExecutedParam +from jedi.evaluate.param import get_executed_params, ExecutedParam def try_iter_content(types, depth=0): @@ -69,12 +69,12 @@ class AbstractArguments(object): def unpack(self, funcdef=None): raise NotImplementedError - def get_params(self, execution_context): - return get_params(execution_context, self) + def get_executed_params(self, execution_context): + return get_executed_params(execution_context, self) class AnonymousArguments(AbstractArguments): - def get_params(self, execution_context): + def get_executed_params(self, execution_context): from jedi.evaluate.dynamic import search_params return search_params( execution_context.evaluator, diff --git a/jedi/evaluate/context/function.py b/jedi/evaluate/context/function.py index 992cecdf..20be8333 100644 --- a/jedi/evaluate/context/function.py +++ b/jedi/evaluate/context/function.py @@ -247,4 +247,4 @@ class FunctionExecutionContext(TreeContext): @evaluator_method_cache() def get_params(self): - return self.var_args.get_params(self) + return self.var_args.get_executed_params(self) diff --git a/jedi/evaluate/context/instance.py b/jedi/evaluate/context/instance.py index 0ce52407..ffc07d91 100644 --- a/jedi/evaluate/context/instance.py +++ b/jedi/evaluate/context/instance.py @@ -334,6 +334,9 @@ class BoundMethod(AbstractFunction): return InstanceFunctionExecution( self._instance, self.parent_context, self, arguments) + def __repr__(self): + return '<%s: %s>' % (self.__class__.__name__, self._function) + class CompiledBoundMethod(compiled.CompiledObject): def __init__(self, func): diff --git a/jedi/evaluate/param.py b/jedi/evaluate/param.py index 1445ef0c..84f281e5 100644 --- a/jedi/evaluate/param.py +++ b/jedi/evaluate/param.py @@ -41,7 +41,7 @@ class ExecutedParam(object): return '<%s: %s>' % (self.__class__.__name__, self.string_name) -def get_params(execution_context, var_args): +def get_executed_params(execution_context, var_args): result_params = [] param_dict = {} funcdef = execution_context.tree_node