summaryrefslogtreecommitdiff
path: root/Lib/subprocess.py
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2014-09-22 15:21:08 +0100
committerLarry Hastings <larry@hastings.org>2014-09-22 15:21:08 +0100
commit2887f76d4512283cf332ca22bef19bc86f4a3147 (patch)
treee3cbf66f90a18678e6ce19b9b5c72f1e3d2e9ec1 /Lib/subprocess.py
parentf26c2e72d8306b733fe9dad539522a3c04d69798 (diff)
parentca2e02cfe68b6d5ddf6cd3f143fe29bd748d0f12 (diff)
downloadcpython-git-2887f76d4512283cf332ca22bef19bc86f4a3147.tar.gz
Merge.
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 ddc033a2a7..bc0ef0b4be 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -837,7 +837,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: