traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Flush std{in,out,err} before closing it. Fixes #1074011. 

Will backport to 2.4 and 2.3.
This commit is contained in:
Martin v. Löwis 2005-01-23 09:41:49 +00:00
parent c300175547
commit 8e3ca8af26
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ What's New in Python 2.5 alpha 1?
Core and builtins Core and builtins
----------------- -----------------
- Bug #1074011: closing sys.std{in,out,err} now causes a flush() and
an ferror() call.
- min() and max() now support key= arguments with the same meaning as in - min() and max() now support key= arguments with the same meaning as in
list.sort(). list.sort().

13
Python/sysmodule.c
View File

@ -927,6 +927,13 @@ settrace() -- set the global debug tracing function\n\
) )
/* end of sys_doc */ ; /* end of sys_doc */ ;
static int
_check_and_flush (FILE *stream)
{
int prev_fail = ferror (stream);
return fflush (stream) || prev_fail ? EOF : 0;
}
PyObject * PyObject *
_PySys_Init(void) _PySys_Init(void)
{ {
@ -940,9 +947,9 @@ _PySys_Init(void)
m = Py_InitModule3("sys", sys_methods, sys_doc); m = Py_InitModule3("sys", sys_methods, sys_doc);
sysdict = PyModule_GetDict(m); sysdict = PyModule_GetDict(m);
sysin = PyFile_FromFile(stdin, "<stdin>", "r", NULL); sysin = PyFile_FromFile(stdin, "<stdin>", "r", _check_and_flush);
sysout = PyFile_FromFile(stdout, "<stdout>", "w", NULL); sysout = PyFile_FromFile(stdout, "<stdout>", "w", _check_and_flush);
syserr = PyFile_FromFile(stderr, "<stderr>", "w", NULL); syserr = PyFile_FromFile(stderr, "<stderr>", "w", _check_and_flush);
if (PyErr_Occurred()) if (PyErr_Occurred())
return NULL; return NULL;
#ifdef MS_WINDOWS #ifdef MS_WINDOWS