diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:16:28 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:16:28 +0000 |
| commit | 23352add84278fc0476b2d6599489fbb70c9f5bc (patch) | |
| tree | 600bf5132e46d31b69efbd3bbc8a3d37159c0744 /Objects/genobject.c | |
| parent | 6d1d733828b49eb03d45da81c6b8c6b849fbc5df (diff) | |
| parent | 0fb1e3c9fc84c62a91f1e5889dc8e0855cefa4ae (diff) | |
| download | cpython-23352add84278fc0476b2d6599489fbb70c9f5bc.tar.gz | |
Issues #29349: Merge Py 2 fix 3.6
Diffstat (limited to 'Objects/genobject.c')
| -rw-r--r-- | Objects/genobject.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Objects/genobject.c b/Objects/genobject.c index 2680ab0e12..24a1da6f3e 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -402,8 +402,7 @@ gen_close(PyGenObject *gen, PyObject *args) if (PyErr_ExceptionMatches(PyExc_StopIteration) || PyErr_ExceptionMatches(PyExc_GeneratorExit)) { PyErr_Clear(); /* ignore these errors */ - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } return NULL; } @@ -1341,7 +1340,7 @@ async_gen_init_hooks(PyAsyncGenObject *o) PyObject *res; Py_INCREF(firstiter); - res = PyObject_CallFunction(firstiter, "O", o); + res = PyObject_CallFunctionObjArgs(firstiter, o, NULL); Py_DECREF(firstiter); if (res == NULL) { return 1; |