From f38ace61a39e64f5fde6f8f402e258177bdf7ff4 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Thu, 7 Jun 2018 03:17:15 -0700 Subject: [PATCH] bpo-17909: Document that json.load can accept a binary IO (GH-7366) (cherry picked from commit bb6366bd7570ff3b74bc66095540bea78f31504e) Co-authored-by: Anthony Sottile --- Doc/library/json.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Doc/library/json.rst b/Doc/library/json.rst index 85798fa2cf..d65fb3f1c3 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 `. + 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 `. *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 `. + .. 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` -- 2.40.0