[Python-checkins] r83855 - in python/branches/release31-maint: Misc/NEWS Python/pythonrun.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun Aug  8 22:49:19 2010
New Revision: 83855

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Python/pythonrun.c

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sun Aug  8 22:49:19 2010
@@ -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

Modified: python/branches/release31-maint/Python/pythonrun.c
==============================================================================
--- python/branches/release31-maint/Python/pythonrun.c	(original)
+++ python/branches/release31-maint/Python/pythonrun.c	Sun Aug  8 22:49:19 2010
@@ -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);
     }