summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-01-18 05:46:49 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-01-18 05:46:49 (GMT)
commitd8af6700b92d922dd115647fd5c8022a730848d3 (patch)
tree74eebc019db6d4592b42bc02a5f59809f7c550d2 /Doc
parentbebf73511a1250fc768bcb7192b5b3c3fd04d8f2 (diff)
parent3d8814e1d30e174ddcb3591a1ff35206e962b064 (diff)
downloadcpython-d8af6700b92d922dd115647fd5c8022a730848d3.zip
cpython-d8af6700b92d922dd115647fd5c8022a730848d3.tar.gz
cpython-d8af6700b92d922dd115647fd5c8022a730848d3.tar.bz2
merge 3.3 (#17814)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/subprocess.rst24
1 files changed, 16 insertions, 8 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 7fbe398..6e696d9 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -715,21 +715,29 @@ The following attributes are also available:
.. attribute:: Popen.stdin
- If the *stdin* argument was :data:`PIPE`, this attribute is a :term:`file
- object` that provides input to the child process. Otherwise, it is ``None``.
+ If the *stdin* argument was :data:`PIPE`, this attribute is a writeable
+ stream object as returned by :func:`open`. If the *universal_newlines*
+ argument was ``True``, the stream is a text stream, otherwise it is a byte
+ stream. If the *stdin* argument was not :data:`PIPE`, this attribute is
+ ``None``.
.. attribute:: Popen.stdout
- If the *stdout* argument was :data:`PIPE`, this attribute is a :term:`file
- object` that provides output from the child process. Otherwise, it is ``None``.
-
+ If the *stdout* argument was :data:`PIPE`, this attribute is a readable
+ stream object as returned by :func:`open`. Reading from the stream provides
+ output from the child process. If the *universal_newlines* argument was
+ ``True``, the stream is a text stream, otherwise it is a byte stream. If the
+ *stdout* argument was not :data:`PIPE`, this attribute is ``None``.
+
.. attribute:: Popen.stderr
- If the *stderr* argument was :data:`PIPE`, this attribute is a :term:`file
- object` that provides error output from the child process. Otherwise, it is
- ``None``.
+ If the *stderr* argument was :data:`PIPE`, this attribute is a readable
+ stream object as returned by :func:`open`. Reading from the stream provides
+ error output from the child process. If the *universal_newlines* argument was
+ ``True``, the stream is a text stream, otherwise it is a byte stream. If the
+ *stderr* argument was not :data:`PIPE`, this attribute is ``None``.
.. attribute:: Popen.pid