mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
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.
This commit is contained in:
parent
d1f9352bd4
commit
7b3f0fa68e
3 changed files with 28 additions and 5 deletions
|
@ -259,6 +259,23 @@ class CmdLineTest(unittest.TestCase):
|
|||
"print(repr(input()))",
|
||||
b"'abc'")
|
||||
|
||||
def test_output_newline(self):
|
||||
# Issue 13119 Newline for print() should be \r\n on Windows.
|
||||
code = """if 1:
|
||||
import sys
|
||||
print(1)
|
||||
print(2)
|
||||
print(3, file=sys.stderr)
|
||||
print(4, file=sys.stderr)"""
|
||||
rc, out, err = assert_python_ok('-c', code)
|
||||
|
||||
if sys.platform == 'win32':
|
||||
self.assertEqual(b'1\r\n2\r\n', out)
|
||||
self.assertEqual(b'3\r\n4', err)
|
||||
else:
|
||||
self.assertEqual(b'1\n2\n', out)
|
||||
self.assertEqual(b'3\n4', err)
|
||||
|
||||
def test_unmached_quote(self):
|
||||
# Issue #10206: python program starting with unmatched quote
|
||||
# spewed spaces to stdout
|
||||
|
|
|
@ -10,6 +10,9 @@ What's New in Python 3.3.0 Beta 2?
|
|||
Core and Builtins
|
||||
-----------------
|
||||
|
||||
- Issue #13119: sys.stdout and sys.stderr are now using "\r\n" newline on
|
||||
Windows, as Python 2.
|
||||
|
||||
- Issue #15534: Fix the fast-search function for non-ASCII Unicode strings.
|
||||
|
||||
- Issue #15508: Fix the docstring for __import__ to have the proper default
|
||||
|
|
|
@ -971,12 +971,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_CallMethodId(io, &PyId_TextIOWrapper, "OsssO",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue