diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-07-29 18:29:26 (GMT) |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-07-29 18:29:26 (GMT) |
| commit | 0598da39ec6ac40f9bebfe3495f47a0e350141ec (patch) | |
| tree | 9f1e1b2ae6f981d83011408a96c8275c135921b0 /Doc | |
| parent | f8d5063645446b73f8c20a29c427cb5711fc629b (diff) | |
| parent | dcf841b78e7579cdb886cb1a26639b9ee7fbe7b3 (diff) | |
| download | cpython-0598da39ec6ac40f9bebfe3495f47a0e350141ec.zip cpython-0598da39ec6ac40f9bebfe3495f47a0e350141ec.tar.gz cpython-0598da39ec6ac40f9bebfe3495f47a0e350141ec.tar.bz2 | |
Merge with 3.4 for Issue #24729
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/tutorial/inputoutput.rst | 6 |
1 files changed, 3 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. - |