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

Fix generator return issues

Browse Source
This commit is contained in:
Dave Halter
2018-09-24 20:59:43 +02:00
parent 75a02a13d9
commit a06ca5d035
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jedi/evaluate/syntax_tree.py
View File

@@ -100,7 +100,7 @@ def eval_node(context, element):
await_context_set = context_set.py__getattribute__(u"__await__")
if not await_context_set:
debug.warning('Tried to run py__await__ on context %s', context)
return _py__stop_iteration_returns(await_context_set.execute_evaluated())
return await_context_set.execute_evaluated().py__stop_iteration_returns()
return context_set
elif typ in ('testlist_star_expr', 'testlist',):
# The implicit tuple in statements.
@@ -136,8 +136,9 @@ def eval_node(context, element):
if len(element.children) and element.children[1].type == 'yield_arg':
# Implies that it's a yield from.
element = element.children[1].children[1]
generators = context.eval_node(element)
return _py__stop_iteration_returns(generators)
generators = context.eval_node(element) \
.py__getattribute__('__iter__').execute_evaluated()
return generators.py__stop_iteration_returns()
# Generator.send() is not implemented.
return NO_CONTEXTS