Merged revisions 68977,68981 via svnmerge from

antoine.pitrou · antoine.pitrou · commit dd858a76eb7e · 2009-01-26T22:03:09.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r68977 | antoine.pitrou | 2009-01-26 22:48:00 +0100 (lun., 26 janv. 2009) | 3 lines Followup of #4705: we can't skip the binary buffering layer for stdin because FileIO doesn't have a read1() method ........ r68981 | antoine.pitrou | 2009-01-26 23:00:21 +0100 (lun., 26 janv. 2009) | 3 lines Fix test so as to also pass in debug mode ........ git-svn-id: http://svn.python.org/projects/python/branches/release30-maint@68982 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
@@ -159,6 +159,16 @@ def test_unbuffered_output(self):
             self.assertEqual(data.strip(), b'x',
                 "text %s not line-buffered" % stream)
 
+    def test_unbuffered_input(self):
+        # sys.stdin still works with '-u'
+        code = ("import sys; sys.stdout.write(sys.stdin.read(1))")
+        p = _spawn_python('-u', '-c', code)
+        p.stdin.write(b'x')
+        p.stdin.flush()
+        data, rc = _kill_python_and_exit_code(p)
+        self.assertEqual(rc, 0)
+        self.assert_(data.startswith(b'x'), data)
+
 
 def test_main():
     test.support.run_unittest(CmdLineTest)
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -739,7 +739,12 @@ create_stdio(PyObject* io,
 	PyObject *line_buffering;
 	int buffering, isatty;
 
-	if (Py_UnbufferedStdioFlag)
+	/* stdin is always opened in buffered mode, first because it shouldn't
+	   make a difference in common use cases, second because TextIOWrapper
+	   depends on the presence of a read1() method which only exists on
+	   buffered streams.
+	*/
+	if (Py_UnbufferedStdioFlag && write_mode)
 		buffering = 0;
 	else
 		buffering = -1;
@@ -753,7 +758,7 @@ create_stdio(PyObject* io,
 	if (buf == NULL)
 		goto error;
 
-	if (!Py_UnbufferedStdioFlag) {
+	if (buffering) {
 		raw = PyObject_GetAttrString(buf, "raw");
 		if (raw == NULL)
 			goto error;
