merge

2017-01-19 21:39:55 -08:00 · 2017-01-19 21:39:55 -08:00 · aecbef408d
parent f8160236ed a57a8a3e2d
commit aecbef408d
1 changed files with 5 additions and 0 deletions
--- 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
 ---------------------