diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2005-01-23 09:50:14 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2005-01-23 09:50:14 (GMT) |
| commit | e62ff1ec5c2d883693088966327ba4b611827557 (patch) | |
| tree | 390791dd726b0003579843d2d1516765f643497a | |
| parent | 748c8a24eea82ccb5e4796f6246724840a25d6d1 (diff) | |
| download | cpython-e62ff1ec5c2d883693088966327ba4b611827557.zip cpython-e62ff1ec5c2d883693088966327ba4b611827557.tar.gz cpython-e62ff1ec5c2d883693088966327ba4b611827557.tar.bz2 | |
Flush std{in,out,err} before closing it. Fixes #1074011.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/sysmodule.c | 13 |
2 files changed, 13 insertions, 3 deletions
@@ -12,6 +12,9 @@ What's New in Python 2.4.1? Core and builtins ----------------- +- Bug #1074011: closing sys.std{in,out,err} now causes a flush() and + an ferror() call. + - Bug #1085744: Add missing overflow check to PySequence_Tuple(). Make resize schedule linear (amortized). diff --git a/Python/sysmodule.c b/Python/sysmodule.c index d246a59..3045c46 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -927,6 +927,13 @@ settrace() -- set the global debug tracing function\n\ ) /* end of sys_doc */ ; +static int +_check_and_flush (FILE *stream) +{ + int prev_fail = ferror (stream); + return fflush (stream) || prev_fail ? EOF : 0; +} + PyObject * _PySys_Init(void) { @@ -940,9 +947,9 @@ _PySys_Init(void) m = Py_InitModule3("sys", sys_methods, sys_doc); sysdict = PyModule_GetDict(m); - sysin = PyFile_FromFile(stdin, "<stdin>", "r", NULL); - sysout = PyFile_FromFile(stdout, "<stdout>", "w", NULL); - syserr = PyFile_FromFile(stderr, "<stderr>", "w", NULL); + sysin = PyFile_FromFile(stdin, "<stdin>", "r", _check_and_flush); + sysout = PyFile_FromFile(stdout, "<stdout>", "w", _check_and_flush); + syserr = PyFile_FromFile(stderr, "<stderr>", "w", _check_and_flush); if (PyErr_Occurred()) return NULL; #ifdef MS_WINDOWS |