diff options
| author | Inada Naoki <songofacandy@gmail.com> | 2020-01-22 10:01:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 10:01:24 (GMT) |
| commit | 5bbac8cbdf140ebce446ea4e7db2b20a5d7b8402 (patch) | |
| tree | 70a155f555f2b0c86faac75a57a8dc67ab473abd /Doc/library | |
| parent | 0d5eac8c327251f8edde5261cee43975d81311f6 (diff) | |
| download | cpython-5bbac8cbdf140ebce446ea4e7db2b20a5d7b8402.zip cpython-5bbac8cbdf140ebce446ea4e7db2b20a5d7b8402.tar.gz cpython-5bbac8cbdf140ebce446ea4e7db2b20a5d7b8402.tar.bz2 | |
bpo-39377: json: Update doc about the encoding option. (GH-18076)
Co-authored-by: Kyle Stanley <aeros167@gmail.com>
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/json.rst | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst index cfe68c9..b923c8e 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -283,19 +283,18 @@ Basic Usage instance containing a JSON document) to a Python object using this :ref:`conversion table <json-to-py-table>`. - The other arguments have the same meaning as in :func:`load`, except - *encoding* which is ignored and deprecated since Python 3.1. + The other arguments have the same meaning as in :func:`load`. If the data being deserialized is not a valid JSON document, a :exc:`JSONDecodeError` will be raised. - .. deprecated-removed:: 3.1 3.9 - *encoding* keyword argument. - .. versionchanged:: 3.6 *s* can now be of type :class:`bytes` or :class:`bytearray`. The input encoding should be UTF-8, UTF-16 or UTF-32. + .. versionchanged:: 3.9 + The keyword argument *encoding* has been removed. + Encoders and Decoders --------------------- |