[Python-checkins] cpython (3.2): Issue #12591: Improve support of "universal newlines" in the subprocess
antoine.pitrou
python-checkins at python.org
Sat Jul 23 22:06:06 CEST 2011
http://hg.python.org/cpython/rev/5cc536fbd7c1
changeset: 71485:5cc536fbd7c1
branch: 3.2
parent: 71482:9144014028f3
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sat Jul 23 22:03:45 2011 +0200
summary:
Issue #12591: Improve support of "universal newlines" in the subprocess
module: the piped streams can now be properly read from or written to.
(this was broken due to the 2.x to 3.x transition; communicate() support
is still sketchy)
files:
Lib/subprocess.py | 2 +-
Lib/test/test_subprocess.py | 64 ++++++++++++++++++------
Misc/NEWS | 3 +
3 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -721,7 +721,7 @@
if p2cwrite != -1:
self.stdin = io.open(p2cwrite, 'wb', bufsize)
if self.universal_newlines:
- self.stdin = io.TextIOWrapper(self.stdin)
+ self.stdin = io.TextIOWrapper(self.stdin, write_through=True)
if c2pread != -1:
self.stdout = io.open(c2pread, 'rb', bufsize)
if universal_newlines:
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -474,44 +474,75 @@
def test_universal_newlines(self):
p = subprocess.Popen([sys.executable, "-c",
'import sys,os;' + SETBINARY +
- 'sys.stdout.write("line1\\n");'
+ 'sys.stdout.write(sys.stdin.readline());'
'sys.stdout.flush();'
'sys.stdout.write("line2\\n");'
'sys.stdout.flush();'
- 'sys.stdout.write("line3\\r\\n");'
+ 'sys.stdout.write(sys.stdin.read());'
'sys.stdout.flush();'
- 'sys.stdout.write("line4\\r");'
+ 'sys.stdout.write("line4\\n");'
'sys.stdout.flush();'
- 'sys.stdout.write("\\nline5");'
+ 'sys.stdout.write("line5\\r\\n");'
'sys.stdout.flush();'
- 'sys.stdout.write("\\nline6");'],
+ 'sys.stdout.write("line6\\r");'
+ 'sys.stdout.flush();'
+ 'sys.stdout.write("\\nline7");'
+ 'sys.stdout.flush();'
+ 'sys.stdout.write("\\nline8");'],
+ stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
universal_newlines=1)
+ p.stdin.write("line1\n")
+ self.assertEqual(p.stdout.readline(), "line1\n")
+ p.stdin.write("line3\n")
+ p.stdin.close()
self.addCleanup(p.stdout.close)
- stdout = p.stdout.read()
- self.assertEqual(stdout, "line1\nline2\nline3\nline4\nline5\nline6")
+ self.assertEqual(p.stdout.readline(),
+ "line2\n")
+ self.assertEqual(p.stdout.read(6),
+ "line3\n")
+ self.assertEqual(p.stdout.read(),
+ "line4\nline5\nline6\nline7\nline8")
def test_universal_newlines_communicate(self):
# universal newlines through communicate()
p = subprocess.Popen([sys.executable, "-c",
'import sys,os;' + SETBINARY +
- 'sys.stdout.write("line1\\n");'
- 'sys.stdout.flush();'
'sys.stdout.write("line2\\n");'
'sys.stdout.flush();'
- 'sys.stdout.write("line3\\r\\n");'
+ 'sys.stdout.write("line4\\n");'
'sys.stdout.flush();'
- 'sys.stdout.write("line4\\r");'
+ 'sys.stdout.write("line5\\r\\n");'
'sys.stdout.flush();'
- 'sys.stdout.write("\\nline5");'
+ 'sys.stdout.write("line6\\r");'
'sys.stdout.flush();'
- 'sys.stdout.write("\\nline6");'],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+ 'sys.stdout.write("\\nline7");'
+ 'sys.stdout.flush();'
+ 'sys.stdout.write("\\nline8");'],
+ stderr=subprocess.PIPE,
+ stdout=subprocess.PIPE,
universal_newlines=1)
self.addCleanup(p.stdout.close)
self.addCleanup(p.stderr.close)
+ # BUG: can't give a non-empty stdin because it breaks both the
+ # select- and poll-based communicate() implementations.
(stdout, stderr) = p.communicate()
- self.assertEqual(stdout, "line1\nline2\nline3\nline4\nline5\nline6")
+ self.assertEqual(stdout,
+ "line2\nline4\nline5\nline6\nline7\nline8")
+
+ def test_universal_newlines_communicate_stdin(self):
+ # universal newlines through communicate(), with only stdin
+ p = subprocess.Popen([sys.executable, "-c",
+ 'import sys,os;' + SETBINARY + '''\nif True:
+ s = sys.stdin.readline()
+ assert s == "line1\\n", repr(s)
+ s = sys.stdin.read()
+ assert s == "line3\\n", repr(s)
+ '''],
+ stdin=subprocess.PIPE,
+ universal_newlines=1)
+ (stdout, stderr) = p.communicate("line1\nline3\n")
+ self.assertEqual(p.returncode, 0)
def test_no_leaking(self):
# Make sure we leak no resources
@@ -1584,7 +1615,8 @@
ProcessTestCaseNoPoll,
HelperFunctionTests,
CommandsWithSpaces,
- ContextManagerTests)
+ ContextManagerTests,
+ )
support.run_unittest(*unit_tests)
support.reap_children()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,9 @@
Library
-------
+- Issue #12591: Improve support of "universal newlines" in the subprocess
+ module: the piped streams can now be properly read from or written to.
+
- Issue #12591: Allow io.TextIOWrapper to work with raw IO objects (without
a read1() method), and add an undocumented *write_through* parameter to
mandate unbuffered writes.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list