mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-27 12:16:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #22274: Merge stderr=STDOUT fix from 3.5

Browse source
This commit is contained in:
Martin Panter 2016-05-13 07:45:21 +00:00
commit f94ec1bd83
3 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/subprocess.py
View file

@ -1412,7 +1412,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):