summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2012-08-04 01:37:32 +0200
committerVictor Stinner <victor.stinner@gmail.com>2012-08-04 01:37:32 +0200
commit7019eb01ae7718d800e943cded3daa24fcac4b63 (patch)
treecca5611168a867e0ada7f4450d6f5b16b6c070c3 /Python
parentf8e90079eded217b212c8189cc423c525317a3b2 (diff)
downloadcpython-7019eb01ae7718d800e943cded3daa24fcac4b63.tar.gz
Close #13119: use "\r\n" newline for sys.stdout/err on Windows
sys.stdout and sys.stderr are now using "\r\n" newline on Windows, as Python 2.
Diffstat (limited to 'Python')
-rw-r--r--Python/pythonrun.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 460946804d..cf4e34c33e 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -870,12 +870,15 @@ create_stdio(PyObject* io,
Py_CLEAR(raw);
Py_CLEAR(text);
- newline = "\n";
#ifdef MS_WINDOWS
- if (!write_mode) {
- /* translate \r\n to \n for sys.stdin on Windows */
- newline = NULL;
- }
+ /* sys.stdin: enable universal newline mode, translate "\r\n" and "\r"
+ newlines to "\n".
+ sys.stdout and sys.stderr: translate "\n" to "\r\n". */
+ newline = NULL;
+#else
+ /* sys.stdin: split lines at "\n".
+ sys.stdout and sys.stderr: don't translate newlines (use "\n"). */
+ newline = "\n";
#endif
stream = PyObject_CallMethod(io, "TextIOWrapper", "OsssO",