diff options
| author | Raymond Hettinger <python@rcn.com> | 2017-01-20 05:39:55 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2017-01-20 05:39:55 (GMT) |
| commit | aecbef408d178d387fabfb0eda28e3f0221c9dd7 (patch) | |
| tree | fa57b0e0dbd8fd944cec22141468f2241976bc6a | |
| parent | f8160236ed89a54b99aebc9922cdb1fbdb1e5351 (diff) | |
| parent | a57a8a3e2d64dfff1bc843c8b34a6a5e06dbe595 (diff) | |
| download | cpython-aecbef408d178d387fabfb0eda28e3f0221c9dd7.zip cpython-aecbef408d178d387fabfb0eda28e3f0221c9dd7.tar.gz cpython-aecbef408d178d387fabfb0eda28e3f0221c9dd7.tar.bz2 | |
merge
| -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 --------------------- |