Skip to content

Commit 5bbac8c

Browse files
methaneaeros
andauthored
bpo-39377: json: Update doc about the encoding option. (GH-18076)
Co-authored-by: Kyle Stanley <[email protected]>
1 parent 0d5eac8 commit 5bbac8c

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

Doc/library/json.rst

+4-5
Original file line numberDiff line numberDiff line change
@@ -283,19 +283,18 @@ Basic Usage
283283
instance containing a JSON document) to a Python object using this
284284
:ref:`conversion table <json-to-py-table>`.
285285

286-
The other arguments have the same meaning as in :func:`load`, except
287-
*encoding* which is ignored and deprecated since Python 3.1.
286+
The other arguments have the same meaning as in :func:`load`.
288287

289288
If the data being deserialized is not a valid JSON document, a
290289
:exc:`JSONDecodeError` will be raised.
291290

292-
.. deprecated-removed:: 3.1 3.9
293-
*encoding* keyword argument.
294-
295291
.. versionchanged:: 3.6
296292
*s* can now be of type :class:`bytes` or :class:`bytearray`. The
297293
input encoding should be UTF-8, UTF-16 or UTF-32.
298294

295+
.. versionchanged:: 3.9
296+
The keyword argument *encoding* has been removed.
297+
299298

300299
Encoders and Decoders
301300
---------------------

Doc/whatsnew/3.9.rst

+7-3
Original file line numberDiff line numberDiff line change
@@ -424,11 +424,15 @@ Removed
424424
(Contributed by Victor Stinner in :issue:`39350`.)
425425

426426
* The *buffering* parameter of :class:`bz2.BZ2File` has been removed. Since
427-
Python 3.0, it was ignored and using it was emitting
428-
:exc:`DeprecationWarning`. Pass an open file object to control how the file
429-
is opened.
427+
Python 3.0, it was ignored and using it emitted a :exc:`DeprecationWarning`.
428+
Pass an open file object to control how the file is opened.
430429
(Contributed by Victor Stinner in :issue:`39357`.)
431430

431+
* The *encoding* parameter of :func:`json.loads` has been removed.
432+
As of Python 3.1, it was deprecated and ignored; using it has emitted a
433+
:exc:`DeprecationWarning` since Python 3.8.
434+
(Contributed by Inada Naoki in :issue:`39377`)
435+
432436

433437
Porting to Python 3.9
434438
=====================

0 commit comments

Comments
 (0)