[Python-checkins] cpython (merge 3.6 -> default): merge

[raymond.hettinger]

https://hg.python.org/cpython/rev/cb6d4df2bd9b
changeset:   106244:cb6d4df2bd9b
parent:      106242:ef1146c95860
parent:      106243:3452ff9e8f0a
user:        Raymond Hettinger <python at rcn.com>
date:        Thu Jan 19 21:39:55 2017 -0800
summary:
  merge

files:
  Doc/library/json.rst |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -278,6 +278,11 @@
    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
 ---------------------
 

-- 
Repository URL: https://hg.python.org/cpython