diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-01-26 21:48:00 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-01-26 21:48:00 (GMT) |
| commit | 27fe9fc448ed2669320e1b3e7e43c955137b980a (patch) | |
| tree | ee48d0e81932b7521baeb14f91b714a32d1dc7f4 /Python/pythonrun.c | |
| parent | 0302cf50ebbaf3da5d5358bdfb5f61babb3f1c6f (diff) | |
| download | cpython-27fe9fc448ed2669320e1b3e7e43c955137b980a.zip cpython-27fe9fc448ed2669320e1b3e7e43c955137b980a.tar.gz cpython-27fe9fc448ed2669320e1b3e7e43c955137b980a.tar.bz2 | |
Followup of #4705: we can't skip the binary buffering layer for stdin because FileIO doesn't have a read1() method
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 6819be5..65c6f5f 100644 --- 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; |