From 06de4d66e7a57378d1368ed44a9c23ecfcb4c334 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 10 Mar 2013 19:26:49 +0100 Subject: [PATCH] Revert "Add get_names_of_scope option to evaluate.get_names_of_scope" This reverts commit 154662ea273a17f00186546bdf9d75833553d307. --- jedi/api_classes.py | 2 +- jedi/evaluate.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/jedi/api_classes.py b/jedi/api_classes.py index b2314fcf..19d4580f 100644 --- a/jedi/api_classes.py +++ b/jedi/api_classes.py @@ -376,7 +376,7 @@ def get_definitions(scope): :rtype: list of Definition """ tuples = evaluate.get_names_of_scope( - scope, star_search=False, include_builtin=False, include_parent=False) + scope, star_search=False, include_builtin=False) names = reduce(lambda x, y: x + y[1], tuples, []) return [Definition(d) for d in sorted(names, key=lambda s: s.start_pos)] diff --git a/jedi/evaluate.py b/jedi/evaluate.py index a5ef4918..4dd1dd88 100644 --- a/jedi/evaluate.py +++ b/jedi/evaluate.py @@ -115,7 +115,7 @@ def get_defined_names_for_position(scope, position=None, start_scope=None): def get_names_of_scope(scope, position=None, star_search=True, - include_builtin=True, include_parent=True): + include_builtin=True): """ Get all completions (names) possible for the current scope. The star search option is only here to provide an optimization. Otherwise @@ -180,9 +180,6 @@ def get_names_of_scope(scope, position=None, star_search=True, # is a list comprehension yield scope, scope.get_set_vars(is_internal_call=True) - if not include_parent: - return - scope = scope.parent # This is used, because subscopes (Flow scopes) would distort the # results.