summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-09-21 20:30:50 (GMT)
committerGitHub <noreply@github.com>2018-09-21 20:30:50 (GMT)
commit29da8392a7ffa3e72212809e4838a11ee6e134d1 (patch)
treeceed4b6a3260fdae115ab0614826e2bff928624a
parentf37496e893d743dbd01c802c8e8cdc16498a1604 (diff)
downloadcpython-29da8392a7ffa3e72212809e4838a11ee6e134d1.zip
cpython-29da8392a7ffa3e72212809e4838a11ee6e134d1.tar.gz
cpython-29da8392a7ffa3e72212809e4838a11ee6e134d1.tar.bz2
Make docs of exitcode for subprocess.getstatusoutput more clear. (GH-9477)
Make it more accurate and not limited to UNIX. (cherry picked from commit 7d161726e4ddd2b2cdd7ac58a7e9e9ea3f57a807) Co-authored-by: Xiang Zhang <angwerzx@126.com>
-rw-r--r--Doc/library/subprocess.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index f624adb..dfb183a 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -1199,14 +1199,15 @@ handling consistency are valid for these functions.
Windows support was added.
The function now returns (exitcode, output) instead of (status, output)
- as it did in Python 3.3.3 and earlier. See :func:`WEXITSTATUS`.
+ as it did in Python 3.3.3 and earlier. exitcode has the same value as
+ :attr:`~Popen.returncode`.
.. 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
+ Like :func:`getstatusoutput`, except the exit code is ignored and the return
value is a string containing the command's output. Example::
>>> subprocess.getoutput('ls /bin/ls')