summaryrefslogtreecommitdiffstats
path: root/Doc/library/subprocess.rst
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-08-15 15:11:27 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-08-15 15:11:27 (GMT)
commit27bbcfb8ff55ed2c57042bf72eb2ba01ec7e4169 (patch)
treed4a7886a29e92e4811c1087086aa30e1c27eb586 /Doc/library/subprocess.rst
parent592df20efcc41d2448c8acc35b3b4f15aa5c0bf2 (diff)
parentee0a945ae4077d9e4ffdb77e247ed13265316897 (diff)
downloadcpython-27bbcfb8ff55ed2c57042bf72eb2ba01ec7e4169.zip
cpython-27bbcfb8ff55ed2c57042bf72eb2ba01ec7e4169.tar.gz
cpython-27bbcfb8ff55ed2c57042bf72eb2ba01ec7e4169.tar.bz2
Merge #15543: glossary entry for and 'universal newlines', and links to it.
Patch by Chris Jerdonek.
Diffstat (limited to 'Doc/library/subprocess.rst')
-rw-r--r--Doc/library/subprocess.rst9
1 files changed, 6 insertions, 3 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 7557c92..ff6bb99 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -285,9 +285,12 @@ default values. The arguments that are most commonly needed are:
:data:`STDOUT`, which indicates that the stderr data from the child
process should be captured into the same file handle as for *stdout*.
+ .. index::
+ single: universal newlines; subprocess module
+
If *universal_newlines* is ``True``, the file objects *stdin*, *stdout*
- and *stderr* will be opened as text streams with universal newlines support,
- using the encoding returned by :func:`locale.getpreferredencoding`.
+ and *stderr* will be opened as text streams in :term:`universal newlines`
+ mode using the encoding returned by :func:`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'``.
@@ -508,7 +511,7 @@ functions.
.. _side-by-side assembly: http://en.wikipedia.org/wiki/Side-by-Side_Assembly
If *universal_newlines* is ``True``, the file objects *stdin*, *stdout*
- and *stderr* are opened as text files with universal newlines support, as
+ and *stderr* are opened as text streams in universal newlines mode, as
described above in :ref:`frequently-used-arguments`.
If given, *startupinfo* will be a :class:`STARTUPINFO` object, which is