summaryrefslogtreecommitdiffstats
path: root/Lib/subprocess.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-09-21 19:26:11 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-09-21 19:26:11 (GMT)
commitd7fc141c7d5c51b5217a6144248e2d1eff68bcb8 (patch)
treefd147155803216746fcf7dd610aa3220a9d845e2 /Lib/subprocess.py
parentc904e87c1317973440001f9afc4e0febfc344a4a (diff)
parent6e311aa748b123b1f1333c2c86b5904b57168276 (diff)
downloadcpython-d7fc141c7d5c51b5217a6144248e2d1eff68bcb8.zip
cpython-d7fc141c7d5c51b5217a6144248e2d1eff68bcb8.tar.gz
cpython-d7fc141c7d5c51b5217a6144248e2d1eff68bcb8.tar.bz2
Merge heads
Diffstat (limited to 'Lib/subprocess.py')
-rw-r--r--Lib/subprocess.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index bb7d0dc..3ce0ed1 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -841,7 +841,8 @@ class Popen(object):
if p2cwrite != -1:
self.stdin = io.open(p2cwrite, 'wb', bufsize)
if universal_newlines:
- self.stdin = io.TextIOWrapper(self.stdin, write_through=True)
+ self.stdin = io.TextIOWrapper(self.stdin, write_through=True,
+ line_buffering=(bufsize == 1))
if c2pread != -1:
self.stdout = io.open(c2pread, 'rb', bufsize)
if universal_newlines: