[Python-checkins] cpython (merge 3.2 -> 3.2): merge with main repo 3.2 branch
georg.brandl
python-checkins at python.org
Sat Apr 6 16:44:08 CEST 2013
http://hg.python.org/cpython/rev/b2cb7bc1edb8
changeset: 83125:b2cb7bc1edb8
branch: 3.2
tag: v3.2.4rc1
parent: 83124:ca1c5a656bdd
parent: 82945:0fb7db2f9b5e
user: Georg Brandl <georg at python.org>
date: Mon Mar 25 06:56:31 2013 +0100
summary:
merge with main repo 3.2 branch
files:
Doc/library/subprocess.rst | 23 ++++++++++-------
Lib/subprocess.py | 18 +++++++-------
Lib/test/test_queue.py | 5 +++-
Lib/test/test_subprocess.py | 22 +++++++++++++++++
Misc/NEWS | 7 +++++
PC/VC6/readme.txt | 4 +-
PC/VS8.0/pyproject.vsprops | 2 +-
PCbuild/pyproject.vsprops | 2 +-
PCbuild/readme.txt | 2 +-
Tools/buildbot/external-common.bat | 4 +-
10 files changed, 62 insertions(+), 27 deletions(-)
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -284,7 +284,7 @@
functions.
-.. class:: Popen(args, bufsize=0, executable=None, stdin=None, stdout=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, \
startupinfo=None, creationflags=0, restore_signals=True, \
@@ -356,17 +356,20 @@
untrusted input. See the warning under :ref:`frequently-used-arguments`
for details.
- *bufsize*, if given, has the same meaning as the corresponding argument to the
- built-in open() function: :const:`0` means unbuffered, :const:`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 :const:`0` (unbuffered).
+ *bufsize* will be supplied as the corresponding argument to the :meth:`io.open`
+ function when creating the stdin/stdout/stderr pipe file objects:
+ :const:`0` means unbuffered (read and write are one system call and can return short),
+ :const:`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.
- .. note::
+ .. versionchanged:: 3.2.4
- If you experience performance issues, it is recommended that you try to
- enable buffering by setting *bufsize* to either -1 or a large enough
- positive value (such as 4096).
+ *bufsize* now defaults to -1 to enable buffering by default to match the
+ behavior that most code expects. In 3.2.0 through 3.2.3 it incorrectly
+ defaulted to :const:`0` which was unbuffered and allowed short reads.
+ This was unintentional and did not match the behavior of Python 2 as
+ most code expected.
The *executable* argument specifies a replacement program to execute. It
is very seldom needed. When ``shell=False``, *executable* replaces the
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -25,7 +25,7 @@
===========================
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 @@
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 @@
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 @@
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_queue.py b/Lib/test/test_queue.py
--- a/Lib/test/test_queue.py
+++ b/Lib/test/test_queue.py
@@ -46,6 +46,9 @@
class BlockingTestMixin:
+ def tearDown(self):
+ self.t = None
+
def do_blocking_test(self, block_func, block_args, trigger_func, trigger_args):
self.t = _TriggerThread(trigger_func, trigger_args)
self.t.start()
@@ -260,7 +263,7 @@
raise FailingQueueException("You Lose")
return queue.Queue._get(self)
-class FailingQueueTest(unittest.TestCase, BlockingTestMixin):
+class FailingQueueTest(BlockingTestMixin, unittest.TestCase):
def failing_queue_test(self, q):
if q.qsize():
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
@@ -79,6 +79,28 @@
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",
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -233,6 +233,11 @@
Library
-------
+- 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.
+
- Issue #17521: Corrected non-enabling of logger following two calls to
fileConfig().
@@ -1079,6 +1084,8 @@
Build
-----
+- Issue #17425: Build with openssl 1.0.0k on Windows.
+
- Issue #16754: Fix the incorrect shared library extension on linux. Introduce
two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of
SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4.
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -153,9 +153,9 @@
Unpack into the "dist" directory, retaining the folder name from
the archive - for example, the latest stable OpenSSL will install as
- dist/openssl-1.0.0j
+ dist/openssl-1.0.0k
- You need to use version 1.0.0j of OpenSSL.
+ You need to use version 1.0.0k of OpenSSL.
You can install the NASM assembler from
http://www.nasm.us/
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.0j"
+ Value="$(externalsDir)\openssl-1.0.0k"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.0j"
+ Value="$(externalsDir)\openssl-1.0.0k"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -139,7 +139,7 @@
Get the source code through
- svn export http://svn.python.org/projects/external/openssl-1.0.0j
+ svn export http://svn.python.org/projects/external/openssl-1.0.0k
** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
obtaining external sources then you don't need to manually get the source
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -14,7 +14,7 @@
@rem if exist tk8.4.16 rd /s/q tk8.4.16
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
@rem if exist db-4.4.20 rd /s/q db-4.4.20
- at rem if exist openssl-1.0.0j rd /s/q openssl-1.0.0j
+ at rem if exist openssl-1.0.0k rd /s/q openssl-1.0.0k
@rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4
@rem bzip
@@ -24,7 +24,7 @@
)
@rem OpenSSL
-if not exist openssl-1.0.0j svn export http://svn.python.org/projects/external/openssl-1.0.0j
+if not exist openssl-1.0.0k svn export http://svn.python.org/projects/external/openssl-1.0.0k
@rem tcl/tk
if not exist tcl-8.5.9.0 (
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list