mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-14 12:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

(3.3->default) Cleanup of documentation change from #17860

Browse Source 
Reformulated the textual change, and applied it to the docstring as well.
This commit is contained in:
Ronald Oussoren 2013-07-07 09:28:01 +02:00
commit 5f8e78545c
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Doc/library/subprocess.rst
View File

@ -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

3
Lib/subprocess.py
View File

@ -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