diff --git a/jedi/api.py b/jedi/api.py index 938af649..e14b0ac7 100644 --- a/jedi/api.py +++ b/jedi/api.py @@ -160,7 +160,7 @@ class Script(object): and n.lower().startswith(like.lower()) \ or n.startswith(like): if not evaluate.filter_private_variable(s, - user_stmt or self._parser.user_scope, n): + user_stmt or self._parser.user_scope, n): new = api_classes.Completion(c, needs_dot, len(like), s) k = (new.name, new.complete) # key if k in comp_dct and settings.no_completion_duplicates: @@ -552,7 +552,6 @@ class Script(object): cur_name_part = name_part kill_count += 1 - context = self._module.get_context() just_from = next(context) == 'from' @@ -658,8 +657,6 @@ class Interpreter(Script): return completions - - def defined_names(source, path=None, encoding='utf-8'): """ Get all definitions in `source` sorted by its position. diff --git a/jedi/docstrings.py b/jedi/docstrings.py index 7d3f5110..bbc3777b 100644 --- a/jedi/docstrings.py +++ b/jedi/docstrings.py @@ -51,8 +51,7 @@ def follow_param(param): param_str) user_position = (2, 0) - p = Parser(param_str, None, user_position, - no_docstr=True) + p = Parser(param_str, None, user_position, no_docstr=True) if p.user_stmt is None: return [] return evaluate.follow_statement(p.user_stmt) diff --git a/jedi/dynamic.py b/jedi/dynamic.py index 7b97bbcc..03ac5634 100644 --- a/jedi/dynamic.py +++ b/jedi/dynamic.py @@ -147,9 +147,9 @@ class ParamListener(object): def search_params(param): """ This is a dynamic search for params. If you try to complete a type: + >>> def func(foo): - >>> # here is the completion - >>> foo + ... foo >>> func(1) >>> func("") @@ -186,12 +186,12 @@ def search_params(param): # ``follow_call_path`` on the call_path and it would # also work. def listRightIndex(lst, value): - return len(lst) - lst[-1::-1].index(value) -1 + return len(lst) - lst[-1::-1].index(value) - 1 # Need to take right index, because there could be a # func usage before. i = listRightIndex(call_path, func_name) - first, last = call_path[:i], call_path[i+1:] + first, last = call_path[:i], call_path[i + 1:] if not last and not call_path.index(func_name) != i: continue scopes = [scope] @@ -204,9 +204,8 @@ def search_params(param): resolve_decorator=False) c = [getattr(escope, 'base_func', None) or escope.base - for escope in s - if escope.isinstance(er.Function, er.Class) - ] + for escope in s + if escope.isinstance(er.Function, er.Class)] if compare in c: # only if we have the correct function we execute # it, otherwise just ignore it. diff --git a/jedi/evaluate.py b/jedi/evaluate.py index 920aded5..a510f4c3 100644 --- a/jedi/evaluate.py +++ b/jedi/evaluate.py @@ -264,7 +264,7 @@ def find_name(scope, name_str, position=None, search_global=False, t = 'tuple' if c == '*' else 'dict' res_new = [er.Instance( find_name(builtin.Builtin.scope, t)[0]) - ] + ] if not r.assignment_details: # this means that there are no default params, # so just ignore it. @@ -436,8 +436,8 @@ def find_name(scope, name_str, position=None, search_global=False, if not result and isinstance(nscope, er.Instance): # __getattr__ / __getattribute__ result += check_getattr(nscope, name_str) - debug.dbg('sfn filter "%s" in (%s-%s): %s@%s' % (name_str, scope, - nscope, u(result), position)) + debug.dbg('sfn filter "%s" in (%s-%s): %s@%s' + % (name_str, scope, nscope, u(result), position)) return result def descriptor_check(result):