]> granicus.if.org Git - python/commitdiff
Issue #29281: Fill-in a missing versionchanged entry
authorRaymond Hettinger <python@rcn.com>
Fri, 20 Jan 2017 05:39:37 +0000 (21:39 -0800)
committerRaymond Hettinger <python@rcn.com>
Fri, 20 Jan 2017 05:39:37 +0000 (21:39 -0800)
Doc/library/json.rst

index 76e936f2bc0edd91066cc68d4877361cbcacc8e1..ed238e29ecf13e567e119c1f1ef8929ab6507061 100644 (file)
@@ -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
 ---------------------