commit 8a8f7f983099f172d1f7c25d4fd99f5c0eb14072
author Serhiy Storchaka <storchaka@gmail.com> Mon Jun 09 09:13:04 2014 +0300
committer Serhiy Storchaka <storchaka@gmail.com> Mon Jun 09 09:13:04 2014 +0300
tree ece2ee26d3edfee06c27e325f7aff80cf9c2adfb
parent b1f59cecc97000396604a3852804932512598938

Issue #21677: Fixed chaining nonnormalized exceptions in io close() methods.

Modules/_io/bufferedio.c

diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 7494646..d0e92e5 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -549,6 +549,7 @@
         }
         else {
             PyObject *val2;
+            PyErr_NormalizeException(&exc, &val, &tb);
             Py_DECREF(exc);
             Py_XDECREF(tb);
             PyErr_Fetch(&exc, &val2, &tb);

Modules/_io/textio.c

diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index ba5789d..55392b4 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -2614,6 +2614,7 @@
             }
             else {
                 PyObject *val2;
+                PyErr_NormalizeException(&exc, &val, &tb);
                 Py_DECREF(exc);
                 Py_XDECREF(tb);
                 PyErr_Fetch(&exc, &val2, &tb);