changeset:   97135:47330144debd
parent:      97130:7163dd7e9511
parent:      97134:575e60ed7cb8
user:        Jason R. Coombs <jaraco@jaraco.com>
date:        Wed Jul 29 14:29:47 2015 -0400
files:       Misc/NEWS
description:
Merge with 3.5 for Issue #24729


diff -r 7163dd7e9511 -r 47330144debd Doc/tutorial/inputoutput.rst
--- a/Doc/tutorial/inputoutput.rst	Thu Jul 30 06:20:21 2015 +1200
+++ b/Doc/tutorial/inputoutput.rst	Wed Jul 29 14:29:47 2015 -0400
@@ -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 -r 7163dd7e9511 -r 47330144debd Misc/NEWS
--- a/Misc/NEWS	Thu Jul 30 06:20:21 2015 +1200
+++ b/Misc/NEWS	Wed Jul 29 14:29:47 2015 -0400
@@ -51,6 +51,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?
 ==================================