Mercurial > cpython-lru_cache-weakref
changeset 57960:ffd800ef46ea
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.
........
| author | Georg Brandl <georg@python.org> |
|---|---|
| date | Mon, 28 Dec 2009 08:10:38 +0000 |
| parents | a11a8e53c495 |
| children | c1972eef3579 |
| files | Lib/subprocess.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Lib/subprocess.py Mon Dec 28 08:02:38 2009 +0000 +++ b/Lib/subprocess.py Mon Dec 28 08:10:38 2009 +0000 @@ -449,11 +449,11 @@ 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: