summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2013-03-23 18:44:25 (GMT)
committerGregory P. Smith <greg@krypto.org>2013-03-23 18:44:25 (GMT)
commita1ed539268e37b12a4a864738b4d1e12bdb92793 (patch)
tree1942f0090785cf474ab377c903a30bdbd0435ba3 /Lib
parent68b4cc87cd75822552914fb59f5bf53fe6c28202 (diff)
downloadcpython-a1ed539268e37b12a4a864738b4d1e12bdb92793.zip
cpython-a1ed539268e37b12a4a864738b4d1e12bdb92793.tar.gz
cpython-a1ed539268e37b12a4a864738b4d1e12bdb92793.tar.bz2
Fixes issue #17488: Change the subprocess.Popen bufsize parameter default value
from unbuffered (0) to buffering (-1) to match the behavior existing code expects and match the behavior of the subprocess module in Python 2 to avoid introducing hard to track down bugs.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/subprocess.py18
-rw-r--r--Lib/test/test_subprocess.py22
2 files changed, 31 insertions, 9 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 7cfe5df..7255645 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -25,7 +25,7 @@ Using the subprocess module
===========================
This module defines one class called Popen:
-class Popen(args, bufsize=0, executable=None,
+class Popen(args, bufsize=-1, executable=None,
stdin=None, stdout=None, stderr=None,
preexec_fn=None, close_fds=True, shell=False,
cwd=None, env=None, universal_newlines=False,
@@ -56,12 +56,12 @@ not all MS Windows applications interpret the command line the same
way: The list2cmdline is designed for applications using the same
rules as the MS C runtime.
-bufsize, if given, has the same meaning as the corresponding argument
-to the built-in open() function: 0 means unbuffered, 1 means line
-buffered, any other positive value means use a buffer of
-(approximately) that size. A negative bufsize means to use the system
-default, which usually means fully buffered. The default value for
-bufsize is 0 (unbuffered).
+bufsize will be supplied as the corresponding argument to the io.open()
+function when creating the stdin/stdout/stderr pipe file objects:
+0 means unbuffered (read & write are one system call and can return short),
+1 means line buffered, any other positive value means use a buffer of
+approximately that size. A negative bufsize, the default, means the system
+default of io.DEFAULT_BUFFER_SIZE will be used.
stdin, stdout and stderr specify the executed programs' standard
input, standard output and standard error file handles, respectively.
@@ -638,7 +638,7 @@ _PLATFORM_DEFAULT_CLOSE_FDS = object()
class Popen(object):
- def __init__(self, args, bufsize=0, executable=None,
+ def __init__(self, args, bufsize=-1, executable=None,
stdin=None, stdout=None, stderr=None,
preexec_fn=None, close_fds=_PLATFORM_DEFAULT_CLOSE_FDS,
shell=False, cwd=None, env=None, universal_newlines=False,
@@ -650,7 +650,7 @@ class Popen(object):
self._child_created = False
if bufsize is None:
- bufsize = 0 # Restore default
+ bufsize = -1 # Restore default
if not isinstance(bufsize, int):
raise TypeError("bufsize must be an integer")
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index b1e9027..1a50de3 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -79,6 +79,28 @@ class PopenExecuteChildRaises(subprocess.Popen):
class ProcessTestCase(BaseTestCase):
+ def test_io_buffered_by_default(self):
+ p = subprocess.Popen([sys.executable, "-c", "import sys; sys.exit(0)"],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ try:
+ self.assertIsInstance(p.stdin, io.BufferedIOBase)
+ self.assertIsInstance(p.stdout, io.BufferedIOBase)
+ self.assertIsInstance(p.stderr, io.BufferedIOBase)
+ finally:
+ p.wait()
+
+ def test_io_unbuffered_works(self):
+ p = subprocess.Popen([sys.executable, "-c", "import sys; sys.exit(0)"],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE, bufsize=0)
+ try:
+ self.assertIsInstance(p.stdin, io.RawIOBase)
+ self.assertIsInstance(p.stdout, io.RawIOBase)
+ self.assertIsInstance(p.stderr, io.RawIOBase)
+ finally:
+ p.wait()
+
def test_call_seq(self):
# call() function with sequence argument
rc = subprocess.call([sys.executable, "-c",