Merged revisions 83854 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83854 | antoine.pitrou | 2010-08-08 22:46:42 +0200 (dim., 08 août 2010) | 4 lines
Issue #5319: Print an error if flushing stdout fails at interpreter
shutdown.
........
diff --git a/Misc/NEWS b/Misc/NEWS
index 5670f0d..ede4f04 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
Core and Builtins
-----------------
+- Issue #5319: Print an error if flushing stdout fails at interpreter
+ shutdown.
+
- Issue #6869: Fix a refcount problem in the _ctypes extension.
- Issue #5504: ctypes should now work with systems where mmap can't
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 3886765..84d72f0 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -331,7 +331,7 @@
if (fout != NULL && fout != Py_None) {
tmp = PyObject_CallMethod(fout, "flush", "");
if (tmp == NULL)
- PyErr_Clear();
+ PyErr_WriteUnraisable(fout);
else
Py_DECREF(tmp);
}