[Python-checkins] cpython (merge default -> default): merge from upstream

Sat Mar 19 19:08:10 CET 2011

http://hg.python.org/cpython/rev/16a386443055
changeset: 68684:16a386443055
parent: 68683:64eeb4cd4b56
parent: 68681:cb148da52c47
user: Skip Montanaro <skip at pobox.com>
date: Sat Mar 19 13:03:33 2011 -0500
summary:
 merge from upstream
files:

diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -208,7 +208,7 @@
 Win95/98 specific
 ^^^^^^^^^^^^^^^^^
 
-.. function:: popen(cmd, mode='r', bufsize=None)
+.. function:: popen(cmd, mode='r', bufsize=-1)
 
 Portable :func:`popen` interface. Find a working popen implementation
 preferring :func:`win32pipe.popen`. On Windows NT, :func:`win32pipe.popen`
diff --git a/Lib/os.py b/Lib/os.py
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -779,11 +779,13 @@
 return bs
 
 # Supply os.popen()
-def popen(cmd, mode="r", buffering=None):
+def popen(cmd, mode="r", buffering=-1):
 if not isinstance(cmd, str):
 raise TypeError("invalid cmd type (%s, expected string)" % type(cmd))
 if mode not in ("r", "w"):
 raise ValueError("invalid mode %r" % mode)
+ if buffering == 0 or buffering == None:
+ raise ValueError("popen() does not support unbuffered streams")
 import subprocess, io
 if mode == "r":
 proc = subprocess.Popen(cmd,
diff --git a/Lib/platform.py b/Lib/platform.py
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -357,7 +357,7 @@
 supported_dists=supported_dists,
 full_distribution_name=0)
 
-def popen(cmd, mode='r', bufsize=None):
+def popen(cmd, mode='r', bufsize=-1):
 
 """ Portable popen() interface.
 """
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -743,8 +743,6 @@
 if errread != -1:
 errread = msvcrt.open_osfhandle(errread.Detach(), 0)
 
- if bufsize == 0:
- bufsize = 1 # Nearly unbuffered (XXX for now)
 if p2cwrite != -1:
 self.stdin = io.open(p2cwrite, 'wb', bufsize)
 if self.universal_newlines:
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
@@ -1315,6 +1315,22 @@
 " non-zero with this error:\n%s" %
 stderr.decode('utf-8'))
 
+ def test_select_unbuffered(self):
+ # Issue #11459: bufsize=0 should really set the pipes as
+ # unbuffered (and therefore let select() work properly).
+ select = support.import_module("select")
+ p = subprocess.Popen([sys.executable, "-c",
+ 'import sys;'
+ 'sys.stdout.write("apple")'],
+ stdout=subprocess.PIPE,
+ bufsize=0)
+ f = p.stdout
+ try:
+ self.assertEqual(f.read(4), b"appl")
+ self.assertIn(f, select.select([f], [], [], 0.0)[0])
+ finally:
+ p.wait()
+
 
 @unittest.skipUnless(mswindows, "Windows specific tests")
 class Win32ProcessTestCase(BaseTestCase):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -75,6 +75,9 @@
 Library
 -------
 
+- Issue #11459: A ``bufsize`` value of 0 in subprocess.Popen() really creates
+ unbuffered pipes, such that select() works properly on them.
+
 - Issue #5421: Fix misleading error message when one of socket.sendto()'s
 arguments has the wrong type. Patch by Nikita Vetoshkin.
 
-- 
Repository URL: http://hg.python.org/cpython
