[Python-checkins] cpython (merge 3.3 -> default): (3.3->default) Cleanup of documentation change from #17860

[ronald.oussoren]

http://hg.python.org/cpython/rev/83810f67d16b
changeset:   84477:83810f67d16b
parent:      84475:cc0c8c1c9cca
parent:      84476:f4747e1ce2b1
user:        Ronald Oussoren <ronaldoussoren at mac.com>
date:        Sun Jul 07 09:28:01 2013 +0200
summary:
  (3.3->default) Cleanup of documentation change from #17860

Reformulated the textual change, and applied it to the docstring as well.

files:
  Doc/library/subprocess.rst |  11 +++++++----
  Lib/subprocess.py          |   3 +++
  2 files changed, 10 insertions(+), 4 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -300,11 +300,14 @@
    .. index::
       single: universal newlines; subprocess module
 
-   If *universal_newlines* is ``True``, the file objects *stdin*, *stdout* and
-   *stderr* will be opened as text streams in :term:`universal newlines` mode
+   If *universal_newlines* is ``False`` the file objects *stdin*, *stdout* and
+   *stderr* will be opened as binary streams, and no line ending conversion is
+   done.
+
+   If *universal_newlines* is ``True``, these file objects
+   will be opened as text streams in :term:`universal newlines` mode
    using the encoding returned by :func:`locale.getpreferredencoding(False)
-   <locale.getpreferredencoding>`, otherwise these streams will be opened
-   as binary streams.  For *stdin*, line ending characters
+   <locale.getpreferredencoding>`.  For *stdin*, line ending characters
    ``'\n'`` in the input will be converted to the default line separator
    :data:`os.linesep`.  For *stdout* and *stderr*, all line endings in the
    output will be converted to ``'\n'``.  For more information see the
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -104,6 +104,9 @@
 If env is not None, it defines the environment variables for the new
 process.
 
+If universal_newlines is false, the file objects stdin, stdout and stderr
+are opened as binary files, and no line ending conversion is done.
+
 If universal_newlines is true, the file objects stdout and stderr are
 opened as a text files, but lines may be terminated by any of '\n',
 the Unix end-of-line convention, '\r', the old Macintosh convention or

-- 
Repository URL: http://hg.python.org/cpython