summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-02-23 12:07:37 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-02-23 12:07:37 (GMT)
commitc0f1a1afae3843986eb0bef54b165424361f2510 (patch)
treec650a798108af5024bcee2c01ae8f67586c952c8 /Lib
parentdd071045e776e1c3e8cf6750a2fd1d0958bf19b3 (diff)
downloadcpython-c0f1a1afae3843986eb0bef54b165424361f2510.zip
cpython-c0f1a1afae3843986eb0bef54b165424361f2510.tar.gz
cpython-c0f1a1afae3843986eb0bef54b165424361f2510.tar.bz2
Issue #11272: Fix input() and sys.stdin for Windows newline
On Windows, input() strips '\r' (and not only '\n'), and sys.stdin uses universal newline (replace '\r\n' by '\n').
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_cmd_line.py26
1 files changed, 26 insertions, 0 deletions
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index b21b61e..c4e3adf 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -6,6 +6,7 @@ import test.support, unittest
import os
import sys
import subprocess
+import tempfile
from test.script_helper import spawn_python, kill_python, assert_python_ok, assert_python_failure
@@ -239,6 +240,31 @@ class CmdLineTest(unittest.TestCase):
escaped = repr(text).encode(encoding, 'backslashreplace')
self.assertIn(escaped, data)
+ def check_input(self, code, expected):
+ with tempfile.NamedTemporaryFile("wb+") as stdin:
+ sep = os.linesep.encode('ASCII')
+ stdin.write(sep.join((b'abc', b'def')))
+ stdin.flush()
+ stdin.seek(0)
+ with subprocess.Popen(
+ (sys.executable, "-c", code),
+ stdin=stdin, stdout=subprocess.PIPE) as proc:
+ stdout, stderr = proc.communicate()
+ self.assertEqual(stdout.rstrip(), expected)
+
+ def test_stdin_readline(self):
+ # Issue #11272: check that sys.stdin.readline() replaces '\r\n' by '\n'
+ # on Windows (sys.stdin is opened in binary mode)
+ self.check_input(
+ "import sys; print(repr(sys.stdin.readline()))",
+ b"'abc\\n'")
+
+ def test_builtin_input(self):
+ # Issue #11272: check that input() strips newlines ('\n' or '\r\n')
+ self.check_input(
+ "print(repr(input()))",
+ b"'abc'")
+
def test_main():
test.support.run_unittest(CmdLineTest)