mirror of
https://github.com/AdaCore/cpython.git
synced 2026-02-12 12:57:15 -08:00
Merged revisions 68977,68981 via svnmerge from
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 ........
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user