[Python-checkins] r77087 - in python/branches/py3k: Lib/subprocess.py

[georg.brandl]

Author: georg.brandl
Date: Mon Dec 28 09:10:38 2009
New Revision: 77087

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/subprocess.py

Modified: python/branches/py3k/Lib/subprocess.py
==============================================================================
--- python/branches/py3k/Lib/subprocess.py	(original)
+++ python/branches/py3k/Lib/subprocess.py	Mon Dec 28 09:10:38 2009
@@ -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: