From 23e7c5bd2a47c008ea37e265b0ffcf421489d883 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Wed, 7 Mar 2018 20:10:48 +0100 Subject: [PATCH] eval_element -> eval_node --- jedi/evaluate/arguments.py | 2 +- jedi/evaluate/context/function.py | 2 +- jedi/evaluate/syntax_tree.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jedi/evaluate/arguments.py b/jedi/evaluate/arguments.py index 7eb854d8..ef74b26c 100644 --- a/jedi/evaluate/arguments.py +++ b/jedi/evaluate/arguments.py @@ -135,7 +135,7 @@ class TreeArguments(AbstractArguments): [v for v in values if v is not None] ) elif star_count == 2: - arrays = self._evaluator.eval_element(self.context, el) + arrays = self.context.eval_node(el) for dct in arrays: for key, values in _star_star_dict(self.context, dct, el, funcdef): yield key, values diff --git a/jedi/evaluate/context/function.py b/jedi/evaluate/context/function.py index 05259714..984aebb9 100644 --- a/jedi/evaluate/context/function.py +++ b/jedi/evaluate/context/function.py @@ -135,7 +135,7 @@ class FunctionExecutionContext(TreeContext): def get_return_values(self, check_yields=False): funcdef = self.tree_node if funcdef.type == 'lambdef': - return self.evaluator.eval_element(self, funcdef.children[-1]) + return self.eval_node(funcdef.children[-1]) if check_yields: context_set = NO_CONTEXTS diff --git a/jedi/evaluate/syntax_tree.py b/jedi/evaluate/syntax_tree.py index ce5c329b..7947b903 100644 --- a/jedi/evaluate/syntax_tree.py +++ b/jedi/evaluate/syntax_tree.py @@ -65,7 +65,7 @@ def _py__stop_iteration_returns(generators): @debug.increase_indent @_limit_context_infers def eval_node(context, element): - debug.dbg('eval_element %s@%s', element, element.start_pos) + debug.dbg('eval_node %s@%s', element, element.start_pos) evaluator = context.evaluator typ = element.type if typ in ('name', 'number', 'string', 'atom'): @@ -91,7 +91,7 @@ def eval_node(context, element): context_set = eval_atom(context, first_child) for trailer in children: if trailer == '**': # has a power operation. - right = evaluator.eval_element(context, children[1]) + right = context.eval_node(children[1]) context_set = _eval_comparison( evaluator, context,