From b61d5c9758d601781bf99b9d9462a485078ca624 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 8 Aug 2010 20:49:19 +0000 Subject: Merged revisions 83854 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ 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. ........ --- Misc/NEWS | 3 +++ Python/pythonrun.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 5670f0d..ede4f04 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 3886765..84d72f0 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); } -- cgit v0.12