summaryrefslogtreecommitdiffstats
path: root/Lib/subprocess.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-09-21 19:25:25 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-09-21 19:25:25 (GMT)
commit1a5426dbaf71d8b414abfc781fecb696c2d751dc (patch)
tree375453ae7c79543d1fbb036c923faf9467b3d627 /Lib/subprocess.py
parent52005c2e13f32cfa3b6675997f2ef30adf0606a5 (diff)
parentafe8d0646c9347960e99f5373d6cbd712b5376bb (diff)
downloadcpython-1a5426dbaf71d8b414abfc781fecb696c2d751dc.zip
cpython-1a5426dbaf71d8b414abfc781fecb696c2d751dc.tar.gz
cpython-1a5426dbaf71d8b414abfc781fecb696c2d751dc.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 ddc033a..bc0ef0b 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: