Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22415/Python Modified Files: Tag: release23-maint sysmodule.c Log Message: Partially revert #1074011; don't try to fflush stdin. Index: sysmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/sysmodule.c,v retrieving revision 2.120.6.2 retrieving revision 2.120.6.3 diff -u -d -r2.120.6.2 -r2.120.6.3 --- sysmodule.c 23 Jan 2005 09:50:32 -0000 2.120.6.2 +++ sysmodule.c 27 Jan 2005 18:55:06 -0000 2.120.6.3 @@ -916,7 +916,16 @@ m = Py_InitModule3("sys", sys_methods, sys_doc); sysdict = PyModule_GetDict(m); - sysin = PyFile_FromFile(stdin, "<stdin>", "r", _check_and_flush); + /* Closing the standard FILE* if sys.std* goes aways causes problems + * for embedded Python usages. Closing them when somebody explicitly + * invokes .close() might be possible, but the FAQ promises they get + * never closed. However, we still need to get write errors when + * writing fails (e.g. because stdout is redirected), so we flush the + * streams and check for errors before the file objects are deleted. + * On OS X, fflush()ing stdin causes an error, so we exempt stdin + * from that procedure. + */ + sysin = PyFile_FromFile(stdin, "<stdin>", "r", NULL); sysout = PyFile_FromFile(stdout, "<stdout>", "w", _check_and_flush); syserr = PyFile_FromFile(stderr, "<stderr>", "w", _check_and_flush); if (PyErr_Occurred())