summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-05-17 08:58:51 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-05-17 08:58:51 (GMT)
commite9fb319e688d2d76ab4dbf8b3165ce9d1e24e8fc (patch)
treee4922f7cec794522aa025616e1d160fcfc79b792 /Python
parent372ac5e73260d6e8c8aefe31fd979a7706841868 (diff)
downloadcpython-e9fb319e688d2d76ab4dbf8b3165ce9d1e24e8fc.zip
cpython-e9fb319e688d2d76ab4dbf8b3165ce9d1e24e8fc.tar.gz
cpython-e9fb319e688d2d76ab4dbf8b3165ce9d1e24e8fc.tar.bz2
handle_system_exit() flushs files to warranty the output order
PyObject_Print() writes into the C object stderr, whereas PySys_WriteStderr() writes into the Python object sys.stderr. Each object has its own buffer, so call sys.stderr.flush() and fflush(stderr).
Diffstat (limited to 'Python')
-rw-r--r--Python/pythonrun.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 4932c4a..d398196 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1367,7 +1367,11 @@ handle_system_exit(void)
if (PyLong_Check(value))
exitcode = (int)PyLong_AsLong(value);
else {
+ PyObject *sys_stderr = PySys_GetObject("stderr");
+ if (sys_stderr != NULL)
+ PyObject_CallMethod(sys_stderr, "flush", NULL);
PyObject_Print(value, stderr, Py_PRINT_RAW);
+ fflush(stderr);
PySys_WriteStderr("\n");
exitcode = 1;
}