traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Recorded merge of revisions 77086 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77086 | georg.brandl | 2009-12-28 09:09:32 +0100 (Mo, 28 Dez 2009) | 1 line

  #7381: consistency update, and backport avoiding ``None >= 0`` check from py3k.
........
This commit is contained in:
Georg Brandl 2009-12-28 08:10:38 +00:00
parent af5c238746
commit 127d47092a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/subprocess.py
View File

@ -449,11 +449,11 @@ def check_output(*popenargs, **kwargs):
b'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.
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",
... "ls -l non_existent_file ; exit 0"],
... stderr=subprocess.STDOUT)
... stderr=STDOUT)
b'ls: non_existent_file: No such file or directory\n'
"""
if 'stdout' in kwargs: