commit e2bd2a718602bf6d6d607fc9a0b7574a18874847
author Serhiy Storchaka <storchaka@gmail.com> Wed Oct 08 22:31:52 2014 +0300
committer Serhiy Storchaka <storchaka@gmail.com> Wed Oct 08 22:31:52 2014 +0300
tree 6c5a51a532610fb6717267f2de9661b80405c6e7
parent 0ddbf4795f40d2d3386dc56ffa264b50a015f6c9

Issue #21715: Extracted shared complicated code in the _io module to new
_PyErr_ChainExceptions() function.

Modules/_io/_iomodule.c

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 @@
         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);

Modules/_io/bufferedio.c

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 @@
     }
 
     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:

Modules/_io/textio.c

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 @@
 
         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;
     }