diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-10-08 19:31:52 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-10-08 19:31:52 (GMT) |
| commit | e2bd2a718602bf6d6d607fc9a0b7574a18874847 (patch) | |
| tree | 6c5a51a532610fb6717267f2de9661b80405c6e7 /Modules/_io | |
| parent | 0ddbf4795f40d2d3386dc56ffa264b50a015f6c9 (diff) | |
| download | cpython-e2bd2a718602bf6d6d607fc9a0b7574a18874847.zip cpython-e2bd2a718602bf6d6d607fc9a0b7574a18874847.tar.gz cpython-e2bd2a718602bf6d6d607fc9a0b7574a18874847.tar.bz2 | |
Issue #21715: Extracted shared complicated code in the _io module to new
_PyErr_ChainExceptions() function.
Diffstat (limited to 'Modules/_io')
| -rw-r--r-- | Modules/_io/_iomodule.c | 15 | ||||
| -rw-r--r-- | Modules/_io/bufferedio.c | 16 | ||||
| -rw-r--r-- | Modules/_io/textio.c | 16 |
3 files changed, 6 insertions, 41 deletions
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index 7c4f9cb..45c31a5 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -468,19 +468,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); diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 302db0a..8084aae 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -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: diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 635093e..a3e82a8 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -2608,20 +2608,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; } |