[Python-checkins] bpo-17909: Document that json.load can accept a binary IO (GH-7366)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/f38ace61a39e64f5fde6f8f402e258177bdf7ff4
commit: f38ace61a39e64f5fde6f8f402e258177bdf7ff4
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-06-07T03:17:15-07:00
summary:

bpo-17909: Document that json.load can accept a binary IO (GH-7366)

(cherry picked from commit bb6366bd7570ff3b74bc66095540bea78f31504e)

Co-authored-by: Anthony Sottile <asottile at umich.edu>

files:
M Doc/library/json.rst

diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index 85798fa2cf72..d65fb3f1c33e 100644
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -215,9 +215,9 @@ Basic Usage
 
 .. function:: load(fp, *, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw)
 
-   Deserialize *fp* (a ``.read()``-supporting :term:`file-like object`
-   containing a JSON document) to a Python object using this :ref:`conversion
-   table <json-to-py-table>`.
+   Deserialize *fp* (a ``.read()``-supporting :term:`text file` or
+   :term:`binary file` containing a JSON document) to a Python object using
+   this :ref:`conversion table <json-to-py-table>`.
 
    *object_hook* is an optional function that will be called with the result of
    any object literal decoded (a :class:`dict`).  The return value of
@@ -262,6 +262,10 @@ Basic Usage
    .. versionchanged:: 3.6
       All optional parameters are now :ref:`keyword-only <keyword-only_parameter>`.
 
+   .. versionchanged:: 3.6
+      *fp* can now be a :term:`binary file`. The input encoding should be
+      UTF-8, UTF-16 or UTF-32.
+
 .. function:: loads(s, *, encoding=None, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw)
 
    Deserialize *s* (a :class:`str`, :class:`bytes` or :class:`bytearray`