Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5-corowrapper
Changeset: r87187:8f48a804defb
Date: 2016-09-17 19:44 +0200
http://bitbucket.org/pypy/pypy/changeset/8f48a804defb/
Log: Fixes
diff --git a/pypy/interpreter/generator.py b/pypy/interpreter/generator.py
--- a/pypy/interpreter/generator.py
+++ b/pypy/interpreter/generator.py
@@ -395,10 +395,9 @@
if self.pycode is not None and \
self.frame is not None and \
self.frame.last_instr == -1:
- # XXX PyErr_Occured in condition?
- raise oefmt(self.space.w_RuntimeWarning,
- "coroutine '%s' was never awaited",
- self.get_qualname())
+ space = self.space
+ msg = u"coroutine '%s' was never awaited" % self.get_qualname()
+ space.warn(space.w_RuntimeWarning, space.wrap(msg))
GeneratorOrCoroutine._finalize_(self)
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -1037,10 +1037,6 @@
assert in_generator is not None
w_inputvalue = self.popvalue()
w_gen = self.popvalue()
- if isinstance(w_gen, Coroutine) and not isinstance(self, Coroutine):
- raise oefmt(self.space.w_TypeError,
- "cannot 'yield from' a coroutine object "
- "from a generator")
#
in_generator.w_yielded_from = w_gen
in_generator.next_yield_from(self, w_inputvalue)
@@ -1425,7 +1421,7 @@
self.popvalue()
itemcount -= 1
self.pushvalue(w_dict)
-
+
def GET_YIELD_FROM_ITER(self, oparg, next_instr):
from pypy.interpreter.astcompiler import consts
from pypy.interpreter.generator import GeneratorIterator, Coroutine
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
