[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3: clarify universal-newline wording in tutorial (issue #16266).

[chris.jerdonek]

http://hg.python.org/cpython/rev/a45cb181e4d0
changeset:   79811:a45cb181e4d0
parent:      79808:f6fcff683866
parent:      79810:b5439bca219f
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Oct 17 20:29:07 2012 -0700
summary:
  Merge from 3.3: clarify universal-newline wording in tutorial (issue #16266).

This also null merges from a previous commit.

files:
  Doc/tutorial/inputoutput.rst |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -256,9 +256,10 @@
 :dfn:`binary mode`: now the data is read and written in the form of bytes
 objects.  This mode should be used for all files that don't contain text.
 
-In text mode, the default is to convert platform-specific line endings (``\n``
-on Unix, ``\r\n`` on Windows) to just ``\n`` on reading and ``\n`` back to
-platform-specific line endings on writing.  This behind-the-scenes modification
+In text mode, the default when reading is to convert platform-specific line
+endings (``\n`` on Unix, ``\r\n`` on Windows) to just ``\n``.  When writing in
+text mode, the default is to convert occurrences of ``\n`` back to
+platform-specific line endings.  This behind-the-scenes modification
 to file data is fine for text files, but will corrupt binary data like that in
 :file:`JPEG` or :file:`EXE` files.  Be very careful to use binary mode when
 reading and writing such files.

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