mirror of
https://github.com/python/cpython.git
synced 2024-11-24 02:15:30 +08:00
Issue #11459: A bufsize
value of 0 in subprocess.Popen() really creates
unbuffered pipes, such that select() works properly on them.
This commit is contained in:
commit
7b98d02302
@ -208,7 +208,7 @@ Windows Platform
|
||||
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`
|
||||
|
@ -779,11 +779,13 @@ if not _exists("urandom"):
|
||||
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,
|
||||
|
@ -411,7 +411,7 @@ class _popen:
|
||||
# Alias
|
||||
__del__ = close
|
||||
|
||||
def popen(cmd, mode='r', bufsize=None):
|
||||
def popen(cmd, mode='r', bufsize=-1):
|
||||
|
||||
""" Portable popen() interface.
|
||||
"""
|
||||
|
@ -711,8 +711,6 @@ class Popen(object):
|
||||
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:
|
||||
|
@ -1216,6 +1216,22 @@ class POSIXProcessTestCase(BaseTestCase):
|
||||
" non-zero with this error:\n%s" %
|
||||
stderr.decode('utf8'))
|
||||
|
||||
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):
|
||||
|
@ -43,6 +43,9 @@ Core and Builtins
|
||||
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.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user