diff options
| author | Georg Brandl <georg@python.org> | 2009-12-28 08:10:38 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-12-28 08:10:38 (GMT) |
| commit | 127d47092a98aa9b668dceb03c7b64d9c4c44adc (patch) | |
| tree | 74053086ef71fdd1a416fdf79ab588e959e60186 | |
| parent | af5c23874603ac3c67a6cd6e6a56abad38bbe872 (diff) | |
| download | cpython-127d47092a98aa9b668dceb03c7b64d9c4c44adc.zip cpython-127d47092a98aa9b668dceb03c7b64d9c4c44adc.tar.gz cpython-127d47092a98aa9b668dceb03c7b64d9c4c44adc.tar.bz2 | |
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.
........
| -rw-r--r-- | Lib/subprocess.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index b1577c5..6e753cb 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -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: |