merge 3.3

This commit is contained in:
Benjamin Peterson 2014-01-18 00:49:30 -05:00
commit 3c16c1d821

View file

@ -729,7 +729,7 @@ The following attributes are also available:
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