(original) (raw)

changeset: 92881:9af21752ea2a branch: 3.4 parent: 92879:5433ef907e4f user: Serhiy Storchaka storchaka@gmail.com date: Wed Oct 08 22:31:52 2014 +0300 files: Include/pyerrors.h Modules/_io/_iomodule.c Modules/_io/bufferedio.c Modules/_io/textio.c Python/errors.c description: Issue #21715: Extracted shared complicated code in the _io module to new _PyErr_ChainExceptions() function. diff -r 5433ef907e4f -r 9af21752ea2a Include/pyerrors.h --- a/Include/pyerrors.h Wed Oct 08 20:00:09 2014 +0200 +++ b/Include/pyerrors.h Wed Oct 08 22:31:52 2014 +0300 @@ -123,7 +123,9 @@ /* Context manipulation (PEP 3134) */ PyAPI_FUNC(PyObject *) PyException_GetContext(PyObject *); PyAPI_FUNC(void) PyException_SetContext(PyObject *, PyObject *); - +#ifndef Py_LIMITED_API +PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *); +#endif /* */ diff -r 5433ef907e4f -r 9af21752ea2a Modules/_io/_iomodule.c --- a/Modules/_io/_iomodule.c Wed Oct 08 20:00:09 2014 +0200 +++ b/Modules/_io/_iomodule.c Wed Oct 08 22:31:52 2014 +0300 @@ -468,19 +468,8 @@ 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 -r 5433ef907e4f -r 9af21752ea2a Modules/_io/bufferedio.c --- a/Modules/_io/bufferedio.c Wed Oct 08 20:00:09 2014 +0200 +++ b/Modules/_io/bufferedio.c Wed Oct 08 22:31:52 2014 +0300 @@ -543,20 +543,8 @@ } 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 -r 5433ef907e4f -r 9af21752ea2a Modules/_io/textio.c --- a/Modules/_io/textio.c Wed Oct 08 20:00:09 2014 +0200 +++ b/Modules/_io/textio.c Wed Oct 08 22:31:52 2014 +0300 @@ -2608,20 +2608,8 @@ 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; } diff -r 5433ef907e4f -r 9af21752ea2a Python/errors.c --- a/Python/errors.c Wed Oct 08 20:00:09 2014 +0200 +++ b/Python/errors.c Wed Oct 08 22:31:52 2014 +0300 @@ -384,6 +384,30 @@ Py_XDECREF(oldtraceback); } +/* Like PyErr_Restore(), but if an exception is already set, + set the context associated with it. + */ +void +_PyErr_ChainExceptions(PyObject *exc, PyObject *val, PyObject *tb) +{ + if (exc == NULL) + return; + + if (PyErr_Occurred()) { + 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); + } + else { + PyErr_Restore(exc, val, tb); + } +} + /* Convenience functions to set a type error exception and return 0 */ int /storchaka@gmail.com