Partially revert #1074011; don't try to fflush stdin.

Backported to 2.3 and 2.4.

diff --git a/Misc/NEWS b/Misc/NEWS
index c72723abc513abb442f76c8724d7471f52b4bae1..1d919aa50ba2318a1c015a83fae2d6d1ab3152f8 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,7 +10,7 @@ What's New in Python 2.5 alpha 1?
 Core and builtins
 -----------------
 
-- Bug #1074011: closing sys.std{in,out,err} now causes a flush() and 
+- Bug #1074011: closing sys.std{out,err} now causes a flush() and 
   an ferror() call.
 
 - min() and max() now support key= arguments with the same meaning as in

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 3045c46206d435766cfc7659796969fad2a5b080..dc46697ee362ede3034ecf9f7d4f0e967cd922e3 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -947,7 +947,16 @@ _PySys_Init(void)
        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())