ada/cpython
0
0
Fork 0
mirror of https://github.com/AdaCore/cpython.git synced 2026-02-12 12:57:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 68463 via svnmerge from

Browse Source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r68463 | antoine.pitrou | 2009-01-09 23:12:30 +0100 (ven., 09 janv. 2009) | 4 lines

  Fix bug introduced in r68451: stdio must always be opened in line-buffered mode
  if isatty() is true.
........
This commit is contained in:
Antoine Pitrou
2009-01-09 22:26:34 +00:00
parent 784b4ac30f
commit 1d9990b291
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Python/pythonrun.c
View File

@@ -734,10 +734,10 @@ create_stdio(PyObject* io,
int fd, int write_mode, char* name,
char* encoding, char* errors)
{
PyObject *buf = NULL, *stream = NULL, *text = NULL, *raw = NULL;
PyObject *buf = NULL, *stream = NULL, *text = NULL, *raw = NULL, *res;
const char* mode;
const PyObject *line_buffering;
int buffering;
PyObject *line_buffering;
int buffering, isatty;
if (Py_UnbufferedStdioFlag)
buffering = 0;
@@ -766,13 +766,21 @@ create_stdio(PyObject* io,
text = PyUnicode_FromString(name);
if (text == NULL || PyObject_SetAttrString(raw, "_name", text) < 0)
goto error;
Py_CLEAR(raw);
Py_CLEAR(text);
if (Py_UnbufferedStdioFlag)
res = PyObject_CallMethod(raw, "isatty", "");
if (res == NULL)
goto error;
isatty = PyObject_IsTrue(res);
Py_DECREF(res);
if (isatty == -1)
goto error;
if (isatty || Py_UnbufferedStdioFlag)
line_buffering = Py_True;
else
line_buffering = Py_False;
Py_CLEAR(raw);
Py_CLEAR(text);
stream = PyObject_CallMethod(io, "TextIOWrapper", "OsssO",
buf, encoding, errors,
"\n", line_buffering);