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

_PyErr_ChainExceptions() function.

1 files changed, 2 insertions, 14 deletions

diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index b4c3c40..177e0f3 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -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;
     }