diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-25 10:47:41 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-25 10:47:41 (GMT) |
commit | 179111bd22c1e713c5e026b37300be0c63d4c204 (patch) | |
tree | fbfafdf03849f36dce34afb82c3eb3409ef56853 | |
parent | c8bc3d1c07e120ce4c887d618f9934e961453b3d (diff) | |
parent | 74c17539f26cdefff2b92c93f4233e59106a3f3f (diff) | |
download | cpython-179111bd22c1e713c5e026b37300be0c63d4c204.zip cpython-179111bd22c1e713c5e026b37300be0c63d4c204.tar.gz cpython-179111bd22c1e713c5e026b37300be0c63d4c204.tar.bz2 |
Merge heads
-rw-r--r-- | Misc/NEWS | 3 | ||||
-rw-r--r-- | Modules/_asynciomodule.c | 10 |
2 files changed, 7 insertions, 6 deletions
@@ -29,6 +29,9 @@ Core and Builtins Library ------- +- Issue #28430: Fix iterator of C implemented asyncio.Future doesn't accept + non-None value is passed to it.send(val). + - Issue #27025: Generated names for Tkinter widgets now start by the "!" prefix for readability (was "`"). diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c index 37298cc..a3c96c8 100644 --- a/Modules/_asynciomodule.c +++ b/Modules/_asynciomodule.c @@ -815,13 +815,11 @@ FutureIter_iternext(futureiterobject *it) } static PyObject * -FutureIter_send(futureiterobject *self, PyObject *arg) +FutureIter_send(futureiterobject *self, PyObject *unused) { - if (arg != Py_None) { - PyErr_Format(PyExc_TypeError, - "can't send non-None value to a FutureIter"); - return NULL; - } + /* Future.__iter__ doesn't care about values that are pushed to the + * generator, it just returns "self.result(). + */ return FutureIter_iternext(self); } |