(original) (raw)

changeset: 104992:b977775aa07d parent: 104990:48aac67269e3 parent: 104991:345904bd0456 user: Yury Selivanov yury@magic.io date: Tue Nov 08 19:05:42 2016 -0500 files: Misc/NEWS description: Merge 3.6 (issue #26081) diff -r 48aac67269e3 -r b977775aa07d Modules/_asynciomodule.c --- a/Modules/_asynciomodule.c Tue Nov 08 16:57:40 2016 -0500 +++ b/Modules/_asynciomodule.c Tue Nov 08 19:05:42 2016 -0500 @@ -1044,14 +1044,16 @@ else { if (PyExceptionClass_Check(type)) { val = PyObject_CallObject(type, NULL); + PyErr_SetObject(type, val); + Py_DECREF(val); } else { val = type; assert (PyExceptionInstance_Check(val)); type = (PyObject*)Py_TYPE(val); assert (PyExceptionClass_Check(type)); + PyErr_SetObject(type, val); } - PyErr_SetObject(type, val); } return FutureIter_iternext(self); } /yury@magic.io