From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 8 Jan 2025 08:51:19 +0000 (+0100)
Subject: [3.12] gh-87506: Document that json.load*() can raise UnicodeDecodeError (GH-127355... 
X-Git-Tag: v3.12.9~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e903b8ad13702148d648c8f3043a5234fd533ef7;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-87506: Document that json.load*() can raise UnicodeDecodeError (GH-127355) (#128608)

(cherry picked from commit 15372d0112ac7fbbbe313725dd87d5a45af2f6d3)
(cherry picked from commit cdfb8bc93a4d8c06d2404ba2d243937ba209438c)

Co-authored-by: Srinivas Reddy Thatiparthy (తాటిపర్తి శ్రీనివాస్  రెడ్డి) <thatiparthysreenivas@gmail.com>
Co-authored-by: Erlend Aasland <erlend@python.org>
---

diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index 88730d0cd25b..8d7d76c7bc5c 100644
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -313,6 +313,10 @@ Basic Usage
    :raises JSONDecodeError:
       When the data being deserialized is not a valid JSON document.
 
+   :raises UnicodeDecodeError:
+      When the data being deserialized does not contain
+      UTF-8, UTF-16 or UTF-32 encoded data.
+
    .. versionchanged:: 3.1
 
       * Added the optional *object_pairs_hook* parameter.
@@ -332,15 +336,11 @@ Basic Usage
 
 .. function:: loads(s, *, 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`
+   Identical to :func:`load`, but instead of a file-like object,
+   deserialize *s* (a :class:`str`, :class:`bytes` or :class:`bytearray`
    instance containing a JSON document) to a Python object using this
    :ref:`conversion table <json-to-py-table>`.
 
-   The other arguments have the same meaning as in :func:`load`.
-
-   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.