mirror of
https://github.com/python/cpython.git
synced 2024-12-13 03:45:42 +08:00
Issue #22274: Redirect stderr=STDOUT when stdout not redirected, by Akira Li
This commit is contained in:
parent
07451ddd4f
commit
c76358924f
@ -1401,7 +1401,10 @@ class Popen(object):
|
||||
elif stderr == PIPE:
|
||||
errread, errwrite = os.pipe()
|
||||
elif stderr == STDOUT:
|
||||
errwrite = c2pwrite
|
||||
if c2pwrite != -1:
|
||||
errwrite = c2pwrite
|
||||
else: # child's stdout is not set, use parent's stdout
|
||||
errwrite = sys.__stdout__.fileno()
|
||||
elif stderr == DEVNULL:
|
||||
errwrite = self._get_devnull()
|
||||
elif isinstance(stderr, int):
|
||||
|
@ -504,6 +504,27 @@ class ProcessTestCase(BaseTestCase):
|
||||
tf.seek(0)
|
||||
self.assertStderrEqual(tf.read(), b"strawberry")
|
||||
|
||||
def test_stderr_redirect_with_no_stdout_redirect(self):
|
||||
# test stderr=STDOUT while stdout=None (not set)
|
||||
|
||||
# - grandchild prints to stderr
|
||||
# - child redirects grandchild's stderr to its stdout
|
||||
# - the parent should get grandchild's stderr in child's stdout
|
||||
p = subprocess.Popen([sys.executable, "-c",
|
||||
'import sys, subprocess;'
|
||||
'rc = subprocess.call([sys.executable, "-c",'
|
||||
' "import sys;"'
|
||||
' "sys.stderr.write(\'42\')"],'
|
||||
' stderr=subprocess.STDOUT);'
|
||||
'sys.exit(rc)'],
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE)
|
||||
stdout, stderr = p.communicate()
|
||||
#NOTE: stdout should get stderr from grandchild
|
||||
self.assertStderrEqual(stdout, b'42')
|
||||
self.assertStderrEqual(stderr, b'') # should be empty
|
||||
self.assertEqual(p.returncode, 0)
|
||||
|
||||
def test_stdout_stderr_pipe(self):
|
||||
# capture stdout and stderr to the same pipe
|
||||
p = subprocess.Popen([sys.executable, "-c",
|
||||
|
@ -118,6 +118,9 @@ Core and Builtins
|
||||
Library
|
||||
-------
|
||||
|
||||
- Issue #22274: In the subprocess module, allow stderr to be redirected to
|
||||
stdout even when stdout is not redirected. Patch by Akira Li.
|
||||
|
||||
- Issue #25745: Fixed leaking a userptr in curses panel destructor.
|
||||
|
||||
- Issue #26977: Removed unnecessary, and ignored, call to sum of squares helper
|
||||
|
Loading…
Reference in New Issue
Block a user