[Python-checkins] cpython (merge 3.4 -> 3.5): Merge with 3.4 for Issue #24729

[jason.coombs]

https://hg.python.org/cpython/rev/575e60ed7cb8
changeset:   97134:575e60ed7cb8
branch:      3.5
parent:      97129:93f3ca8fdc39
parent:      97133:3e3fe8a811c3
user:        Jason R. Coombs <jaraco at jaraco.com>
date:        Wed Jul 29 14:29:26 2015 -0400
summary:
  Merge with 3.4 for Issue #24729

files:
  Doc/tutorial/inputoutput.rst |  6 +++---
  Misc/NEWS                    |  3 +++
  2 files changed, 6 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
@@ -247,8 +247,9 @@
 omitted.
 
 Normally, files are opened in :dfn:`text mode`, that means, you read and write
-strings from and to the file, which are encoded in a specific encoding (the
-default being UTF-8).  ``'b'`` appended to the mode opens the file in
+strings from and to the file, which are encoded in a specific encoding. If
+encoding is not specified, the default is platform dependent (see
+:func:`open`). ``'b'`` appended to the mode opens the file in
 :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.
 
@@ -437,4 +438,3 @@
    written in other languages.  It is also insecure by default:
    deserializing pickle data coming from an untrusted source can execute
    arbitrary code, if the data was crafted by a skilled attacker.
-
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,9 @@
 
 - Issue #23589: Remove duplicate sentence from the FAQ.  Patch by Yongzhi Pan.
 
+- Issue #24729: Correct IO tutorial to match implementation regarding
+  encoding parameter to open function.
+
 
 What's New in Python 3.5.0 beta 4?
 ==================================

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