summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-08-08 20:49:19 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-08-08 20:49:19 (GMT)
commitb61d5c9758d601781bf99b9d9462a485078ca624 (patch)
tree96c5a9db219c1cfb67703d50efa2fc3e410fd0d0 /Python
parent68c80edef89a760af961c191538b9df96671e5aa (diff)
downloadcpython-b61d5c9758d601781bf99b9d9462a485078ca624.zip
cpython-b61d5c9758d601781bf99b9d9462a485078ca624.tar.gz
cpython-b61d5c9758d601781bf99b9d9462a485078ca624.tar.bz2
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. ........
Diffstat (limited to 'Python')
-rw-r--r--Python/pythonrun.c2
1 files changed, 1 insertions, 1 deletions
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);
}