From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 8 Aug 2010 20:49:19 +0000 (+0000)
Subject: Merged revisions 83854 via svnmerge from
X-Git-Tag: v3.1.3rc1~366
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b61d5c9758d601781bf99b9d9462a485078ca624;p=python

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 5670f0d146..ede4f041d6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.1.3?
 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 388676589c..84d72f0714 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -331,7 +331,7 @@ flush_std_files(void)
     if (fout != NULL && fout != Py_None) {
         tmp = PyObject_CallMethod(fout, "flush", "");
         if (tmp == NULL)
-            PyErr_Clear();
+            PyErr_WriteUnraisable(fout);
         else
             Py_DECREF(tmp);
     }