Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge

This commit is contained in:
Raymond Hettinger 2017-01-19 21:39:55 -08:00
parent f8160236ed a57a8a3e2d
commit aecbef408d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Doc/library/json.rst
View File

@ -278,6 +278,11 @@ Basic Usage
If the data being deserialized is not a valid JSON document, a If the data being deserialized is not a valid JSON document, a
:exc:`JSONDecodeError` will be raised. :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 Encoders and Decoders
--------------------- ---------------------