From bb42a351e06f1c3e4b81dce67893dfe3ceca5381 Mon Sep 17 00:00:00 2001 From: David Halter Date: Mon, 24 Sep 2012 16:20:16 +0200 Subject: [PATCH] pep8 --- jedi/dynamic.py | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/jedi/dynamic.py b/jedi/dynamic.py index 2703f74b..11d4ad7f 100644 --- a/jedi/dynamic.py +++ b/jedi/dynamic.py @@ -24,6 +24,7 @@ import imports search_param_modules = ['.'] search_param_cache = {} + def get_directory_modules_for_name(mods, name): """ Search a name in the directories of modules. @@ -162,6 +163,26 @@ def check_array_additions(array): res = _check_array_additions(array, current_module, is_list) return res + +def _scan_array(arr, search_name): + """ Returns the function Call that match search_name in an Array. """ + result = [] + for sub in arr: + for s in sub: + if isinstance(s, parsing.Array): + result += _scan_array(s, search_name) + elif isinstance(s, parsing.Call): + while s is not None: + n = s.name + if isinstance(n, parsing.Name) and search_name in n.names: + result.append(s) + + if s.execution is not None: + result += _scan_array(s.execution, search_name) + s = s.next + return result + + counter = 0 def dec(func): """ TODO delete this """ @@ -182,24 +203,6 @@ def dec(func): return wrapper -def _scan_array(arr, search_name): - """ Returns the function Call that match search_name in an Array. """ - result = [] - for sub in arr: - for s in sub: - if isinstance(s, parsing.Array): - result += _scan_array(s, search_name) - elif isinstance(s, parsing.Call): - while s is not None: - n = s.name - if isinstance(n, parsing.Name) and search_name in n.names: - result.append(s) - - if s.execution is not None: - result += _scan_array(s.execution, search_name) - s = s.next - return result - #@dec @evaluate.memoize_default([]) def _check_array_additions(compare_array, module, is_list): @@ -352,7 +355,7 @@ def related_names(definitions, search_name, mods): #print follow_res, [d.parent() for d in follow_res] # compare to see if they match - if True in [r in definitions for r in follow_res]: + if any(r in definitions for r in follow_res): scope = call.parent_stmt() result.append(RelatedName(search, scope)) @@ -409,6 +412,7 @@ def related_names(definitions, search_name, mods): names += check_call(call) return names + def related_name_add_import_modules(definitions, search_name): """ Adds the modules of the imports """ new = set() @@ -422,7 +426,6 @@ def related_name_add_import_modules(definitions, search_name): return set(definitions) | new - class BaseOutput(object): def __init__(self, start_pos, definition): self.module_path = str(definition.get_parent_until().path)