diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-07-29 14:29:47 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-07-29 14:29:47 -0400 |
| commit | ada5578f95bcd4b402e0e3111bb65cb70ee0daae (patch) | |
| tree | 17c0deef71df49cc9a03121869f17d7ecfa995bb | |
| parent | 8ed48182896729baf063e8bae349fc7f40917f08 (diff) | |
| parent | 0598da39ec6ac40f9bebfe3495f47a0e350141ec (diff) | |
| download | cpython-git-ada5578f95bcd4b402e0e3111bb65cb70ee0daae.tar.gz | |
Merge with 3.5 for Issue #24729
| -rw-r--r-- | Doc/tutorial/inputoutput.rst | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst index 6f9c99daf9..c157f22e6c 100644 --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -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. - @@ -51,6 +51,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? ================================== |