ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 09:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
_PyErr_ChainExceptions() function.
This commit is contained in:
Serhiy Storchaka 2014-10-08 22:32:50 +03:00
commit 78184af9b5
5 changed files with 33 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Modules/_io/_iomodule.c
View file

@ -458,19 +458,8 @@ io_open(PyObject *self, PyObject *args, PyObject *kwds)
PyObject *exc, *val, *tb, *close_result;
PyErr_Fetch(&exc, &val, &tb);
close_result = _PyObject_CallMethodId(result, &PyId_close, NULL);
if (close_result != NULL) {
Py_DECREF(close_result);
PyErr_Restore(exc, val, tb);
} else {
PyObject *exc2, *val2, *tb2;
PyErr_Fetch(&exc2, &val2, &tb2);
PyErr_NormalizeException(&exc, &val, &tb);
Py_XDECREF(exc);
Py_XDECREF(tb);
PyErr_NormalizeException(&exc2, &val2, &tb2);
PyException_SetContext(val2, val);
PyErr_Restore(exc2, val2, tb2);
}
_PyErr_ChainExceptions(exc, val, tb);
Py_XDECREF(close_result);
Py_DECREF(result);
}
Py_XDECREF(modeobj);

16
Modules/_io/bufferedio.c
View file

@ -561,20 +561,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:

16
Modules/_io/textio.c
View file

@ -2614,20 +2614,8 @@ textiowrapper_close(textio *self, PyObject *args)
res = _PyObject_CallMethodId(self->buffer, &PyId_close, NULL);
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);
}
return res;
}