summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorTim Golden <mail@timgolden.me.uk>2013-11-03 18:27:40 (GMT)
committerTim Golden <mail@timgolden.me.uk>2013-11-03 18:27:40 (GMT)
commit834856aca9ebd28d314a8d963b193f9d8176a956 (patch)
treec363b5961183535e65ebff6310e84f4daf9b86f8 /Doc
parent5fdb64b5a0a8567a232c2182f0c0439872c987e2 (diff)
parent3a2abb5800af18f45056a8e8ad97fff9490a138c (diff)
downloadcpython-834856aca9ebd28d314a8d963b193f9d8176a956.zip
cpython-834856aca9ebd28d314a8d963b193f9d8176a956.tar.gz
cpython-834856aca9ebd28d314a8d963b193f9d8176a956.tar.bz2
Merge
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/subprocess.rst16
1 files changed, 10 insertions, 6 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index f115634..49a3657 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -1050,10 +1050,12 @@ handling consistency are valid for these functions.
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
- ``(status, output)``. *cmd* is actually run as ``{ cmd ; } 2>&1``, so that the
- returned output will contain output or error messages. A trailing newline is
- stripped from the output. The exit status for the command can be interpreted
+ Execute the string *cmd* in a shell with :class:`Popen` and return a 2-tuple
+ ``(status, output)`` via :func:`Popen.communicate`. Universal newlines mode
+ is used; see the notes on :ref:`frequently-used-arguments` for more details.
+
+ A trailing newline is stripped from the output.
+ The exit status for the command can be interpreted
according to the rules for the C function :c:func:`wait`. Example::
>>> subprocess.getstatusoutput('ls /bin/ls')
@@ -1063,7 +1065,8 @@ handling consistency are valid for these functions.
>>> subprocess.getstatusoutput('/bin/junk')
(256, 'sh: /bin/junk: not found')
- Availability: UNIX.
+ .. versionchanged:: 3.3
+ Availability: Unix & Windows
.. function:: getoutput(cmd)
@@ -1076,7 +1079,8 @@ handling consistency are valid for these functions.
>>> subprocess.getoutput('ls /bin/ls')
'/bin/ls'
- Availability: UNIX.
+ .. versionchanged:: 3.3
+ Availability: Unix & Windows
Notes