From ce3ec4eecb0357018d5be161c5d4f230290d893b Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sat, 24 Aug 2019 02:36:29 +0200 Subject: [PATCH] Rename value -> context for some more places --- jedi/inference/finder.py | 4 ++-- jedi/inference/value/iterable.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jedi/inference/finder.py b/jedi/inference/finder.py index c7783d6b..40e83e86 100644 --- a/jedi/inference/finder.py +++ b/jedi/inference/finder.py @@ -28,11 +28,11 @@ from jedi.parser_utils import is_scope, get_parent_scope class NameFinder(object): - def __init__(self, context, name_value, name_or_str, + def __init__(self, context, name_context, name_or_str, position=None, analysis_errors=True): # Make sure that it's not just a syntax tree node. self._context = context - self._name_context = name_value + self._name_context = name_context self._name = name_or_str if isinstance(name_or_str, tree.Name): self._string_name = name_or_str.value diff --git a/jedi/inference/value/iterable.py b/jedi/inference/value/iterable.py index b0118b7b..328c83c6 100644 --- a/jedi/inference/value/iterable.py +++ b/jedi/inference/value/iterable.py @@ -150,7 +150,7 @@ def comprehension_from_atom(inference_state, value, atom): class ComprehensionMixin(object): @inference_state_method_cache() - def _get_comp_for_value(self, parent_context, comp_for): + def _get_comp_for_context(self, parent_context, comp_for): return CompForContext(parent_context, comp_for) def _nested(self, comp_fors, parent_context=None): @@ -169,18 +169,18 @@ class ComprehensionMixin(object): for i, lazy_value in enumerate(iterated): types = lazy_value.infer() dct = unpack_tuple_to_dict(parent_context, types, exprlist) - value_ = self._get_comp_for_value( + context = self._get_comp_for_context( parent_context, comp_for, ) - with predefine_names(value_, comp_for, dct): + with predefine_names(context, comp_for, dct): try: - for result in self._nested(comp_fors[1:], value_): + for result in self._nested(comp_fors[1:], context): yield result except IndexError: - iterated = value_.infer_node(self._entry_node) + iterated = context.infer_node(self._entry_node) if self.array_type == 'dict': - yield iterated, value_.infer_node(self._value_node) + yield iterated, context.infer_node(self._value_node) else: yield iterated