1
0
forked from VimPlug/jedi

Support generator returns when used with yield from.

This commit is contained in:
Dave Halter
2018-02-28 22:35:58 +01:00
parent 80ee3b8fcf
commit 0d0213ee4c
3 changed files with 60 additions and 4 deletions

View File

@@ -42,12 +42,11 @@ from jedi.parser_utils import get_comp_fors
class AbstractIterableMixin(object):
@property
def name(self):
return compiled.CompiledContextName(self, self.array_type)
def py__stop_iteration_returns(self):
return ContextSet(compiled.builtin_from_name(self.evaluator, u'None'))
class GeneratorBase(BuiltinOverwrite):
class GeneratorBase(BuiltinOverwrite, AbstractIterableMixin):
array_type = None
special_object_identifier = u'GENERATOR_OBJECT'
@@ -71,6 +70,9 @@ class Generator(GeneratorBase):
def py__iter__(self):
return self._func_execution_context.get_yield_lazy_contexts()
def py__stop_iteration_returns(self):
return self._func_execution_context.get_return_values()
def __repr__(self):
return "<%s of %s>" % (type(self).__name__, self._func_execution_context)
@@ -182,6 +184,10 @@ class ComprehensionMixin(object):
class Sequence(BuiltinOverwrite, AbstractIterableMixin):
api_type = u'instance'
@property
def name(self):
return compiled.CompiledContextName(self, self.array_type)
@memoize_method
def get_object(self):
compiled_obj = compiled.builtin_from_name(self.evaluator, self.array_type)