Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.6 (issue #26081)

This commit is contained in:
Yury Selivanov 2016-11-08 19:05:42 -05:00
parent 2ce7c960b4 692796a948
commit bff8f647a9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_asynciomodule.c
View File

@ -1044,14 +1044,16 @@ FutureIter_throw(futureiterobject *self, PyObject *args)
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);
}