From a5e6f26267c31fc290c866367ab041cf98f6b8c7 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Thu, 6 Sep 2018 01:06:09 +0200 Subject: [PATCH] get_filters should always have the default search_global=False --- jedi/evaluate/compiled/__init__.py | 2 +- jedi/evaluate/context/function.py | 4 ++-- jedi/evaluate/context/iterable.py | 2 +- jedi/evaluate/context/klass.py | 3 ++- jedi/evaluate/context/module.py | 2 +- jedi/evaluate/context/namespace.py | 2 +- jedi/evaluate/context/typing.py | 2 +- jedi/evaluate/filters.py | 2 +- jedi/plugins/typeshed.py | 4 ++-- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/jedi/evaluate/compiled/__init__.py b/jedi/evaluate/compiled/__init__.py index 8e37ae39..96d96435 100644 --- a/jedi/evaluate/compiled/__init__.py +++ b/jedi/evaluate/compiled/__init__.py @@ -7,7 +7,7 @@ from jedi.evaluate.helpers import execute_evaluated def builtin_from_name(evaluator, string): builtins = evaluator.builtins_module - filter_ = next(builtins.get_filters(search_global=False)) + filter_ = next(builtins.get_filters()) name, = filter_.get(string) context, = name.infer() return context diff --git a/jedi/evaluate/context/function.py b/jedi/evaluate/context/function.py index f51a80e6..97be4ee6 100644 --- a/jedi/evaluate/context/function.py +++ b/jedi/evaluate/context/function.py @@ -42,7 +42,7 @@ class LambdaName(AbstractNameDefinition): class AbstractFunction(TreeContext): api_type = u'function' - def get_filters(self, search_global, until_position=None, origin_scope=None): + def get_filters(self, search_global=False, until_position=None, origin_scope=None): if search_global: yield ParserTreeFilter( self.evaluator, @@ -263,7 +263,7 @@ class FunctionExecutionContext(TreeContext): for result in self._get_yield_lazy_context(yield_in_same_for_stmt): yield result - def get_filters(self, search_global, until_position=None, origin_scope=None): + def get_filters(self, search_global=False, until_position=None, origin_scope=None): yield self.function_execution_filter(self.evaluator, self, until_position=until_position, origin_scope=origin_scope) diff --git a/jedi/evaluate/context/iterable.py b/jedi/evaluate/context/iterable.py index 1d63189b..4809fb32 100644 --- a/jedi/evaluate/context/iterable.py +++ b/jedi/evaluate/context/iterable.py @@ -87,7 +87,7 @@ class CompForContext(TreeContext): def get_node(self): return self.tree_node - def get_filters(self, search_global, until_position=None, origin_scope=None): + def get_filters(self, search_global=False, until_position=None, origin_scope=None): yield ParserTreeFilter(self.evaluator, self) diff --git a/jedi/evaluate/context/klass.py b/jedi/evaluate/context/klass.py index d479c7bd..cf3ed1de 100644 --- a/jedi/evaluate/context/klass.py +++ b/jedi/evaluate/context/klass.py @@ -175,7 +175,8 @@ class ClassContext(use_metaclass(CachedMetaClass, TreeContext)): def py__class__(self): return compiled.builtin_from_name(self.evaluator, u'type') - def get_filters(self, search_global, until_position=None, origin_scope=None, is_instance=False): + def get_filters(self, search_global=False, until_position=None, + origin_scope=None, is_instance=False): if search_global: yield ParserTreeFilter( self.evaluator, diff --git a/jedi/evaluate/context/module.py b/jedi/evaluate/context/module.py index 98f1815c..3831e8f0 100644 --- a/jedi/evaluate/context/module.py +++ b/jedi/evaluate/context/module.py @@ -52,7 +52,7 @@ class ModuleContext(TreeContext): self._string_names = string_names self.code_lines = code_lines - def get_filters(self, search_global, until_position=None, origin_scope=None): + def get_filters(self, search_global=False, until_position=None, origin_scope=None): yield MergedFilter( ParserTreeFilter( self.evaluator, diff --git a/jedi/evaluate/context/namespace.py b/jedi/evaluate/context/namespace.py index f41898c7..c0ec2fe6 100644 --- a/jedi/evaluate/context/namespace.py +++ b/jedi/evaluate/context/namespace.py @@ -33,7 +33,7 @@ class ImplicitNamespaceContext(Context): self._fullname = fullname self.paths = paths - def get_filters(self, search_global, until_position=None, origin_scope=None): + def get_filters(self, search_global=False, until_position=None, origin_scope=None): yield DictFilter(self._sub_modules_dict()) @property diff --git a/jedi/evaluate/context/typing.py b/jedi/evaluate/context/typing.py index 12841627..1a5e8cfa 100644 --- a/jedi/evaluate/context/typing.py +++ b/jedi/evaluate/context/typing.py @@ -479,7 +479,7 @@ class _AbstractAnnotatedClass(ClassContext): def get_type_var_filter(self): return TypeVarFilter(self.get_given_types(), self.find_annotation_variables()) - def get_filters(self, search_global, *args, **kwargs): + def get_filters(self, search_global=False, *args, **kwargs): for f in super(_AbstractAnnotatedClass, self).get_filters(search_global, *args, **kwargs): yield f diff --git a/jedi/evaluate/filters.py b/jedi/evaluate/filters.py index 955f1ced..2b53876d 100644 --- a/jedi/evaluate/filters.py +++ b/jedi/evaluate/filters.py @@ -426,7 +426,7 @@ class AbstractObjectOverwrite(use_metaclass(_OverwriteMeta, object)): def get_object(self): raise NotImplementedError - def get_filters(self, search_global, *args, **kwargs): + def get_filters(self, search_global=False, *args, **kwargs): yield SpecialMethodFilter(self, self.overwritten_methods, self.get_object()) for filter in self.get_object().get_filters(search_global): diff --git a/jedi/plugins/typeshed.py b/jedi/plugins/typeshed.py index 9793420a..a513962f 100644 --- a/jedi/plugins/typeshed.py +++ b/jedi/plugins/typeshed.py @@ -337,7 +337,7 @@ class _MixedStubContextMixin(object): class _StubContextFilterMixin(_MixedStubContextMixin): - def get_filters(self, search_global, until_position=None, + def get_filters(self, search_global=False, until_position=None, origin_scope=None, **kwargs): filters = super(_StubContextFilterMixin, self).get_filters( search_global, until_position, origin_scope, **kwargs @@ -384,7 +384,7 @@ class StubOnlyModuleContext(ModuleContext): for context in self.non_stub_context_set: yield next(context.get_filters(search_global=False)) - def get_filters(self, search_global, until_position=None, + def get_filters(self, search_global=False, until_position=None, origin_scope=None, **kwargs): filters = super(StubOnlyModuleContext, self).get_filters( search_global, until_position, origin_scope, **kwargs