From 6c193fa09d38b2eb34a3607381c1cbb495e34d6f Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 5 Dec 2007 05:14:58 +0000 Subject: Solve issue 1400 at least in part -- whenever we run Python code, at the end we also flush stderr and stdout. (XXX this may override errors if there's a problem flushing.) --- Python/pythonrun.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 14fe783..f95ea83 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1442,6 +1442,28 @@ PyRun_FileExFlags(FILE *fp, const char *filename, int start, PyObject *globals, return ret; } +static void +flush_io(void) +{ + PyObject *f, *r; + f = PySys_GetObject("stderr"); + if (f != NULL) { + r = PyObject_CallMethod(f, "flush", ""); + if (r) + Py_DECREF(r); + else + PyErr_Clear(); + } + f = PySys_GetObject("stdout"); + if (f != NULL) { + r = PyObject_CallMethod(f, "flush", ""); + if (r) + Py_DECREF(r); + else + PyErr_Clear(); + } +} + static PyObject * run_mod(mod_ty mod, const char *filename, PyObject *globals, PyObject *locals, PyCompilerFlags *flags, PyArena *arena) @@ -1453,6 +1475,7 @@ run_mod(mod_ty mod, const char *filename, PyObject *globals, PyObject *locals, return NULL; v = PyEval_EvalCode(co, globals, locals); Py_DECREF(co); + flush_io(); return v; } @@ -1485,6 +1508,7 @@ run_pyc_file(FILE *fp, const char *filename, PyObject *globals, if (v && flags) flags->cf_flags |= (co->co_flags & PyCF_MASK); Py_DECREF(co); + flush_io(); return v; } -- cgit v0.12