VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Get rid of get_parent_until.

Browse Source
This commit is contained in:
Dave Halter
2017-02-03 09:59:32 +01:00
parent b3cb7b5490
commit 445bf6c419
9 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/evaluate/__init__.py
View File

@@ -161,7 +161,7 @@ class Evaluator(object):
left = context.py__getattribute__(
name, position=stmt.start_pos, search_global=True)
for_stmt = stmt.get_parent_until(tree.ForStmt)
for_stmt = tree.search_ancestor(stmt, 'for_stmt')
if isinstance(for_stmt, tree.ForStmt) and types \
and for_stmt.defines_one_name():
# Iterate through result and add the values, that's possible
@@ -335,8 +335,8 @@ class Evaluator(object):
# This is the first global lookup.
stmt = atom.get_definition()
if isinstance(stmt, tree.CompFor):
stmt = stmt.get_parent_until((tree.ClassOrFunc, tree.ExprStmt))
if stmt.type != 'expr_stmt':
stmt = tree.search_ancestor(stmt, ('expr_stmt', 'lambda', 'funcdef', 'classdef'))
if stmt is None or stmt.type != 'expr_stmt':
# We only need to adjust the start_pos for statements, because
# there the name cannot be used.
stmt = atom