diff options
author | Raymond Hettinger <python@rcn.com> | 2017-01-20 05:39:37 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2017-01-20 05:39:37 (GMT) |
commit | a57a8a3e2d64dfff1bc843c8b34a6a5e06dbe595 (patch) | |
tree | 23f9416041fa387067f661b7a630017e63f01659 /Doc/library/json.rst | |
parent | 346454c7f5e261232d33da5d7493985fd6b2ffad (diff) | |
download | cpython-a57a8a3e2d64dfff1bc843c8b34a6a5e06dbe595.zip cpython-a57a8a3e2d64dfff1bc843c8b34a6a5e06dbe595.tar.gz cpython-a57a8a3e2d64dfff1bc843c8b34a6a5e06dbe595.tar.bz2 |
Issue #29281: Fill-in a missing versionchanged entry
Diffstat (limited to 'Doc/library/json.rst')
-rw-r--r-- | Doc/library/json.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst index 76e936f..ed238e2 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -278,6 +278,11 @@ Basic Usage If the data being deserialized is not a valid JSON document, a :exc:`JSONDecodeError` will be raised. + .. 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. + + Encoders and Decoders --------------------- |