From b97237f264c0c72fa41e49ab6e2a86861225029c Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Thu, 22 Aug 2019 10:06:09 +0200 Subject: [PATCH] Rename the filter context argument to parent_context --- jedi/inference/context.py | 6 +++--- jedi/inference/filters.py | 22 +++++++++++----------- jedi/inference/gradual/stub_value.py | 2 +- jedi/inference/value/instance.py | 6 +++--- jedi/inference/value/klass.py | 4 ++-- jedi/inference/value/module.py | 2 +- jedi/plugins/stdlib.py | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/jedi/inference/context.py b/jedi/inference/context.py index 5e236c2a..a438baf3 100644 --- a/jedi/inference/context.py +++ b/jedi/inference/context.py @@ -89,7 +89,7 @@ class FunctionContext(AbstractContext): def get_filters(self, until_position=None, origin_scope=None): yield ParserTreeFilter( self.inference_state, - context=self, + parent_context=self, until_position=until_position, origin_scope=origin_scope ) @@ -113,7 +113,7 @@ class ModuleContext(AbstractContext): next(filters) yield MergedFilter( ParserTreeFilter( - context=self, + parent_context=self, until_position=until_position, origin_scope=origin_scope ), @@ -153,7 +153,7 @@ class ClassContext(AbstractContext): def get_global_filter(self, until_position=None, origin_scope=None): return ParserTreeFilter( - context=self, + parent_context=self, until_position=until_position, origin_scope=origin_scope ) diff --git a/jedi/inference/filters.py b/jedi/inference/filters.py index 54c06908..cb59893b 100644 --- a/jedi/inference/filters.py +++ b/jedi/inference/filters.py @@ -68,11 +68,11 @@ def _get_definition_names(used_names, name_key): class AbstractUsedNamesFilter(AbstractFilter): name_class = TreeNameDefinition - def __init__(self, context, parser_scope): + def __init__(self, parent_context, parser_scope): self._parser_scope = parser_scope self._module_node = self._parser_scope.get_root_node() self._used_names = self._module_node.get_used_names() - self.context = context + self.parent_context = parent_context def get(self, name, **filter_kwargs): return self._convert_names(self._filter( @@ -81,7 +81,7 @@ class AbstractUsedNamesFilter(AbstractFilter): )) def _convert_names(self, names): - return [self.name_class(self.context, name) for name in names] + return [self.name_class(self.parent_context, name) for name in names] def values(self, **filter_kwargs): return self._convert_names( @@ -94,11 +94,11 @@ class AbstractUsedNamesFilter(AbstractFilter): ) def __repr__(self): - return '<%s: %s>' % (self.__class__.__name__, self.context) + return '<%s: %s>' % (self.__class__.__name__, self.parent_context) class ParserTreeFilter(AbstractUsedNamesFilter): - def __init__(self, context, node_context=None, until_position=None, + def __init__(self, parent_context, node_context=None, until_position=None, origin_scope=None): """ node_context is an option to specify a second value for use cases @@ -107,8 +107,8 @@ class ParserTreeFilter(AbstractUsedNamesFilter): value of the other classes. """ if node_context is None: - node_context = context - super(ParserTreeFilter, self).__init__(context, node_context.tree_node) + node_context = parent_context + super(ParserTreeFilter, self).__init__(parent_context, node_context.tree_node) self._node_context = node_context self._origin_scope = origin_scope self._until_position = until_position @@ -143,10 +143,10 @@ class ParserTreeFilter(AbstractUsedNamesFilter): class FunctionExecutionFilter(ParserTreeFilter): param_name = ParamName - def __init__(self, context, node_context=None, + def __init__(self, parent_context, node_context=None, until_position=None, origin_scope=None): super(FunctionExecutionFilter, self).__init__( - context, + parent_context, node_context, until_position, origin_scope @@ -157,9 +157,9 @@ class FunctionExecutionFilter(ParserTreeFilter): for name in names: param = search_ancestor(name, 'param') if param: - yield self.param_name(self.context, name) + yield self.param_name(self.parent_context, name) else: - yield TreeNameDefinition(self.context, name) + yield TreeNameDefinition(self.parent_context, name) class GlobalNameFilter(AbstractUsedNamesFilter): diff --git a/jedi/inference/gradual/stub_value.py b/jedi/inference/gradual/stub_value.py index 1e41039b..9c9a0324 100644 --- a/jedi/inference/gradual/stub_value.py +++ b/jedi/inference/gradual/stub_value.py @@ -37,7 +37,7 @@ class StubModuleValue(ModuleValue): def _get_stub_filters(self, origin_scope): return [StubFilter( - context=self.as_context(), + parent_context=self.as_context(), origin_scope=origin_scope )] + list(self.iter_star_filters()) diff --git a/jedi/inference/value/instance.py b/jedi/inference/value/instance.py index bae2e1c1..5851eb03 100644 --- a/jedi/inference/value/instance.py +++ b/jedi/inference/value/instance.py @@ -469,7 +469,7 @@ class InstanceClassFilter(AbstractFilter): def _convert(self, names): return [ - LazyInstanceClassName(self._instance, self._class_filter.context, n) + LazyInstanceClassName(self._instance, self._class_filter.parent_context, n) for n in names ] @@ -485,7 +485,7 @@ class SelfAttributeFilter(ClassFilter): def __init__(self, value, class_value, origin_scope): super(SelfAttributeFilter, self).__init__( - context=value, + parent_context=value, node_context=class_value.as_context(), origin_scope=origin_scope, is_instance=True, @@ -508,7 +508,7 @@ class SelfAttributeFilter(ClassFilter): yield name def _convert_names(self, names): - return [self.name_class(self.context, self._class_value, name) for name in names] + return [self.name_class(self.parent_context, self._class_value, name) for name in names] def _check_flows(self, names): return names diff --git a/jedi/inference/value/klass.py b/jedi/inference/value/klass.py index b961b56c..26267692 100644 --- a/jedi/inference/value/klass.py +++ b/jedi/inference/value/klass.py @@ -97,7 +97,7 @@ class ClassFilter(ParserTreeFilter): def _convert_names(self, names): return [ self.name_class( - parent_context=self.context, + parent_context=self.parent_context, tree_name=name, name_context=self._node_context, apply_decorators=not self._is_instance, @@ -107,7 +107,7 @@ class ClassFilter(ParserTreeFilter): def _equals_origin_scope(self): node = self._origin_scope while node is not None: - if node == self._parser_scope or node == self.context: + if node == self._parser_scope or node == self.parent_context: return True node = get_cached_parent_scope(self._used_names, node) return False diff --git a/jedi/inference/value/module.py b/jedi/inference/value/module.py index 5f1581d0..e411bf59 100644 --- a/jedi/inference/value/module.py +++ b/jedi/inference/value/module.py @@ -98,7 +98,7 @@ class ModuleMixin(SubModuleDictMixin): def get_filters(self, origin_scope=None): yield MergedFilter( ParserTreeFilter( - context=self.as_context(), + parent_context=self.as_context(), origin_scope=origin_scope ), GlobalNameFilter(self, self.tree_node), diff --git a/jedi/plugins/stdlib.py b/jedi/plugins/stdlib.py index eaf16094..ccf77854 100644 --- a/jedi/plugins/stdlib.py +++ b/jedi/plugins/stdlib.py @@ -792,7 +792,7 @@ def get_metaclass_filters(func): for metaclass in metaclasses: if metaclass.py__name__() == 'EnumMeta' \ and metaclass.get_root_context().py__name__() == 'enum': - filter_ = ParserTreeFilter(context=cls) + filter_ = ParserTreeFilter(parent_context=cls.as_context()) return [DictFilter({ name.string_name: EnumInstance(cls, name).name for name in filter_.values() })]