traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge with 3.4 for Issue #24729

This commit is contained in:
Jason R. Coombs 2015-07-29 14:29:26 -04:00
parent f8d5063645 dcf841b78e
commit 0598da39ec
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/tutorial/inputoutput.rst
View File

@ -247,8 +247,9 @@ writing. The *mode* argument is optional; ``'r'`` will be assumed if it's
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 @@ The reference for the :mod:`json` module contains an explanation of this.
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.

3
Misc/NEWS
View File

@ -28,6 +28,9 @@ Documentation
- 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?
==================================