mirror of
https://github.com/python/cpython
synced 2026-09-29 08:45:29 +03:00
Issue #10197 Tweak docs for subprocess.getstatusoutput and align the documentation, the module docstring, and the function docstring.
This commit is contained in:
parent
be47cffcb2
commit
607981402c
2 changed files with 18 additions and 14 deletions
|
|
@ -1058,9 +1058,9 @@ handling consistency are valid for these functions.
|
|||
|
||||
Return ``(status, output)`` of executing *cmd* in a shell.
|
||||
|
||||
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.
|
||||
Execute the string *cmd* in a shell with :meth:`Popen.check_output` and
|
||||
return a 2-tuple ``(status, output)``. 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
|
||||
|
|
|
|||
|
|
@ -145,11 +145,13 @@ check_call(*popenargs, **kwargs):
|
|||
getstatusoutput(cmd):
|
||||
Return (status, output) of executing cmd in a shell.
|
||||
|
||||
Execute the string 'cmd' in a shell with 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 according to the rules for the C function wait(). Example:
|
||||
Execute the string 'cmd' in a shell with 'check_output' and
|
||||
return a 2-tuple (status, output). Universal newlines mode is used,
|
||||
meaning that the result with be decoded to a string.
|
||||
|
||||
A trailing newline is stripped from the output.
|
||||
The exit status for the command can be interpreted
|
||||
according to the rules for the function 'wait'. Example:
|
||||
|
||||
>>> subprocess.getstatusoutput('ls /bin/ls')
|
||||
(0, '/bin/ls')
|
||||
|
|
@ -684,13 +686,15 @@ def list2cmdline(seq):
|
|||
# NB This only works (and is only relevant) for POSIX.
|
||||
|
||||
def getstatusoutput(cmd):
|
||||
"""Return (status, output) of executing cmd in a shell.
|
||||
""" Return (status, output) of executing cmd in a shell.
|
||||
|
||||
Execute the string 'cmd' in a shell with 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 according to the rules for the C function wait(). Example:
|
||||
Execute the string 'cmd' in a shell with 'check_output' and
|
||||
return a 2-tuple (status, output). Universal newlines mode is used,
|
||||
meaning that the result with be decoded to a string.
|
||||
|
||||
A trailing newline is stripped from the output.
|
||||
The exit status for the command can be interpreted
|
||||
according to the rules for the function 'wait'. Example:
|
||||
|
||||
>>> import subprocess
|
||||
>>> subprocess.getstatusoutput('ls /bin/ls')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue