diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2015-07-29 18:25:58 (GMT) |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-07-29 18:25:58 (GMT) |
commit | dcf841b78e7579cdb886cb1a26639b9ee7fbe7b3 (patch) | |
tree | 89fc3e60528e74652be29c43fb75443ab6edd297 | |
parent | bd4dd54737db2394305745a9cc70981a7ba9eccf (diff) | |
parent | 842c07414e336dce7a9ec74e1b7cedae2f7dd5ad (diff) | |
download | cpython-dcf841b78e7579cdb886cb1a26639b9ee7fbe7b3.zip cpython-dcf841b78e7579cdb886cb1a26639b9ee7fbe7b3.tar.gz cpython-dcf841b78e7579cdb886cb1a26639b9ee7fbe7b3.tar.bz2 |
Merge
-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 6f9c99d..c157f22 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. - @@ -398,6 +398,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. + - Issue #24351: Clarify what is meant by "identifier" in the context of string.Template instances. |