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

Cleanup with_stmt.

Browse Source
This commit is contained in:
Dave Halter
2017-04-09 21:20:33 +02:00
parent f855c2bb70
commit 769cc80d6b
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/evaluate/finder.py
View File

@@ -192,7 +192,7 @@ def _name_to_types(evaluator, context, tree_name):
elif typ == 'expr_stmt': elif typ == 'expr_stmt':
types = _remove_statements(evaluator, context, node, tree_name) types = _remove_statements(evaluator, context, node, tree_name)
elif typ == 'with_stmt': elif typ == 'with_stmt':
types = context.eval_node(node.node_from_name(tree_name)) types = context.eval_node(node.get_context_manager_from_name(tree_name))
elif typ in ('import_from', 'import_name'): elif typ in ('import_from', 'import_name'):
types = imports.infer_import(context, tree_name) types = imports.infer_import(context, tree_name)
elif typ in ('funcdef', 'classdef'): elif typ in ('funcdef', 'classdef'):

11
jedi/parser/python/tree.py
View File

@@ -789,12 +789,11 @@ class WithStmt(Flow):
names += _defined_names(with_item.children[2]) names += _defined_names(with_item.children[2])
return names return names
def node_from_name(self, name): def get_context_manager_from_name(self, name):
node = name node = name.parent
while True: if node.type != 'with_item':
node = node.parent raise ValueError('The name is not actually part of a with statement.')
if node.type == 'with_item': return node.children[0]
return node.children[0]
class Import(PythonBaseNode): class Import(PythonBaseNode):