Issue #21715: Extracted shared complicated code in the _io module to new

_PyErr_ChainExceptions() function.
This commit is contained in:
Serhiy Storchaka 2014-10-08 22:31:52 +03:00
parent 0ddbf4795f
commit e2bd2a7186
5 changed files with 33 additions and 42 deletions

View file

@ -543,20 +543,8 @@ buffered_close(buffered *self, PyObject *args)
}
if (exc != NULL) {
if (res != NULL) {
Py_CLEAR(res);
PyErr_Restore(exc, val, tb);
}
else {
PyObject *exc2, *val2, *tb2;
PyErr_Fetch(&exc2, &val2, &tb2);
PyErr_NormalizeException(&exc, &val, &tb);
Py_DECREF(exc);
Py_XDECREF(tb);
PyErr_NormalizeException(&exc2, &val2, &tb2);
PyException_SetContext(val2, val);
PyErr_Restore(exc2, val2, tb2);
}
_PyErr_ChainExceptions(exc, val, tb);
Py_CLEAR(res);
}
end: