diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2013-07-07 07:28:01 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2013-07-07 07:28:01 (GMT) |
| commit | 5f8e78545ce03c12207cff711001e162539beb75 (patch) | |
| tree | 5d657154eb0720492c49f1b96df85b55ab3041d1 | |
| parent | ef9b47f0b8980ce9df5c8a4112799e621d099ee8 (diff) | |
| parent | 385521c90e35565ceb1bc54ab31b217321fd2d84 (diff) | |
| download | cpython-5f8e78545ce03c12207cff711001e162539beb75.zip cpython-5f8e78545ce03c12207cff711001e162539beb75.tar.gz cpython-5f8e78545ce03c12207cff711001e162539beb75.tar.bz2 | |
(3.3->default) Cleanup of documentation change from #17860
Reformulated the textual change, and applied it to the docstring as well.
| -rw-r--r-- | Doc/library/subprocess.rst | 11 | ||||
| -rw-r--r-- | Lib/subprocess.py | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 7dfda5a..dc7d0b3 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -300,11 +300,14 @@ default values. The arguments that are most commonly needed are: .. 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 index d299f04..3d77b26 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -104,6 +104,9 @@ in the child process prior to executing the command. 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 |