[Python-checkins] cpython (merge 3.3 -> default): merge

[gregory.p.smith]

http://hg.python.org/cpython/rev/d3d170d32533
changeset:   82854:d3d170d32533
parent:      82851:ce4154268c47
parent:      82853:4f99a4337cea
user:        Gregory P. Smith <greg at krypto.org>
date:        Wed Mar 20 18:32:45 2013 -0700
summary:
  merge

files:
  Doc/library/subprocess.rst |  8 +++-----
  Lib/subprocess.py          |  7 +++----
  2 files changed, 6 insertions(+), 9 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,9 @@
 
    .. note::
 
-      The *universal_newlines* feature is supported only if Python is built
-      with universal newline support (the default).  Also, the newlines
-      attribute of the file objects :attr:`Popen.stdin`, :attr:`Popen.stdout`
-      and :attr:`Popen.stderr` are not updated by the
-      :meth:`Popen.communicate` method.
+      The newlines attribute of the file objects :attr:`Popen.stdin`,
+      :attr:`Popen.stdout` and :attr:`Popen.stderr` are not updated by
+      the :meth:`Popen.communicate` method.
 
    If *shell* is ``True``, the specified command will be executed through
    the shell.  This can be useful if you are using Python primarily for the
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -108,10 +108,9 @@
 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
 '\r\n', the Windows convention.  All of these external representations
-are seen as '\n' by the Python program.  Note: This feature is only
-available if Python is built with universal newline support (the
-default).  Also, the newlines attribute of the file objects stdout,
-stdin and stderr are not updated by the communicate() method.
+are seen as '\n' by the Python program.  Also, the newlines attribute
+of the file objects stdout, stdin and stderr are not updated by the
+communicate() method.
 
 The startupinfo and creationflags, if given, will be passed to the
 underlying CreateProcess() function.  They can specify things such as

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