diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-10-08 19:32:50 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-10-08 19:32:50 (GMT) |
| commit | 78184af9b5aaf8699bbf6ed1da4607685a4b96de (patch) | |
| tree | bf0a9a9fe8825b38744b73d0ceaeff46ea5561c2 /Modules/_io/bufferedio.c | |
| parent | 94262ebc9c1249c1fdec771a48e9f666c37cfcde (diff) | |
| parent | e2bd2a718602bf6d6d607fc9a0b7574a18874847 (diff) | |
| download | cpython-78184af9b5aaf8699bbf6ed1da4607685a4b96de.zip cpython-78184af9b5aaf8699bbf6ed1da4607685a4b96de.tar.gz cpython-78184af9b5aaf8699bbf6ed1da4607685a4b96de.tar.bz2 | |
Issue #21715: Extracted shared complicated code in the _io module to new
_PyErr_ChainExceptions() function.
Diffstat (limited to 'Modules/_io/bufferedio.c')
| -rw-r--r-- | Modules/_io/bufferedio.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 3f14a20..ce85f56 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -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: |