diff options
| author | Georg Brandl <georg@python.org> | 2010-10-06 10:38:58 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-10-06 10:38:58 (GMT) |
| commit | d098c3d94cd9bc74fa4d6f3a2752965e12860a03 (patch) | |
| tree | b62f15f6b3e28c65c8c11c0949f100cc70db5181 /Doc/library/subprocess.rst | |
| parent | c755e90288ba6cdb38f0fbcce297fd7fbe35cfe6 (diff) | |
| download | cpython-d098c3d94cd9bc74fa4d6f3a2752965e12860a03.zip cpython-d098c3d94cd9bc74fa4d6f3a2752965e12860a03.tar.gz cpython-d098c3d94cd9bc74fa4d6f3a2752965e12860a03.tar.bz2 | |
Merged revisions 85274 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r85274 | georg.brandl | 2010-10-06 12:26:05 +0200 (Mi, 06 Okt 2010) | 1 line
Fix errors found by "make suspicious".
........
Diffstat (limited to 'Doc/library/subprocess.rst')
| -rw-r--r-- | Doc/library/subprocess.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 0c441f8..7402ad5 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -239,6 +239,7 @@ This module also defines four shortcut functions: .. function:: getstatusoutput(cmd) + Return ``(status, output)`` of executing *cmd* in a shell. Execute the string *cmd* in a shell with :func:`os.popen` and return a 2-tuple @@ -258,6 +259,7 @@ This module also defines four shortcut functions: .. function:: getoutput(cmd) + Return output (stdout and stderr) of executing *cmd* in a shell. Like :func:`getstatusoutput`, except the exit status is ignored and the return |