From: Raymond Hettinger <python@rcn.com>
Date: Fri, 20 Jan 2017 05:39:37 +0000 (-0800)
Subject: Issue #29281:  Fill-in a missing versionchanged entry
X-Git-Tag: v3.6.1rc1~158
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a57a8a3e2d64dfff1bc843c8b34a6a5e06dbe595;p=thirdparty%2FPython%2Fcpython.git

Issue #29281:  Fill-in a missing versionchanged entry
---

diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index 76e936f2bc0e..ed238e29ecf1 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
 ---------------------