mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

#7381: consistency update, and backport avoiding `None >= 0` check from py3k.

Browse source
This commit is contained in:
Georg Brandl 2009-12-28 08:09:32 +00:00
parent fe8df4fa35
commit 02e7dfde63
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/subprocess.py
View file

@ -136,7 +136,8 @@ check_output(*popenargs, **kwargs):
The arguments are the same as for the Popen constructor. Example: The arguments are the same as for the Popen constructor. Example:
output = subprocess.check_output(["ls", "-l", "/dev/null"]) output = check_output(["ls", "-l", "/dev/null"])
Exceptions Exceptions
---------- ----------
@ -462,7 +463,8 @@ _active = []
def _cleanup(): def _cleanup():
for inst in _active[:]: for inst in _active[:]:
if inst._internal_poll(_deadstate=sys.maxint) >= 0: res = inst._internal_poll(_deadstate=sys.maxint)
if res is not None and res >= 0:
try: try:
_active.remove(inst) _active.remove(inst)
except ValueError: except ValueError:
@ -517,11 +519,11 @@ def check_output(*popenargs, **kwargs):
'crw-rw-rw- 1 root root 1, 3 Oct 18 2007 /dev/null\n' 'crw-rw-rw- 1 root root 1, 3 Oct 18 2007 /dev/null\n'
The stdout argument is not allowed as it is used internally. The stdout argument is not allowed as it is used internally.
To capture standard error in the result, use stderr=subprocess.STDOUT. To capture standard error in the result, use stderr=STDOUT.
>>> check_output(["/bin/sh", "-c", >>> check_output(["/bin/sh", "-c",
... "ls -l non_existent_file ; exit 0"], ... "ls -l non_existent_file ; exit 0"],
... stderr=subprocess.STDOUT) ... stderr=STDOUT)
'ls: non_existent_file: No such file or directory\n' 'ls: non_existent_file: No such file or directory\n'
""" """
if 'stdout' in kwargs: if 'stdout' in kwargs: