[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#17814)

Sat Jan 18 06:49:39 CET 2014

http://hg.python.org/cpython/rev/1a7d416c57ff
changeset: 88535:1a7d416c57ff
parent: 88533:7f6712954d5d
parent: 88534:946257d3c648
user: Benjamin Peterson <benjamin at python.org>
date: Sat Jan 18 00:46:49 2014 -0500
summary:
 merge 3.3 (#17814)
files:
 Doc/library/subprocess.rst | 24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -715,21 +715,29 @@
 
 .. 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
-- 
Repository URL: http://hg.python.org/cpython
