Update to take into accounts comments.

Carreau · Carreau · commit 0ccae85ce1ab · 2019-04-08T18:04:38.000-07:00
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
@@ -277,8 +277,8 @@ Basic Usage
    If the data being deserialized is not a valid JSON document, a
    :exc:`JSONDecodeError` will be raised.
 
-   .. deprecated:: 3.1
-      The *encoding* keyword argument has been deprecated and will be ignored.
+   .. deprecated-removed:: 3.1 3.9
+      *encoding* keyword argument.
 
    .. versionchanged:: 3.6
       *s* can now be of type :class:`bytes` or :class:`bytearray`. The
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
@@ -345,11 +345,11 @@ def loads(s, *, cls=None, object_hook=None, parse_float=None,
     if "encoding" not in kw:
         import warnings
         warnings.warn(
-            "passing 'encoding' as a keyword argument is deprecated since"
-            " Python 3.1, is ignored and will be removed in Python 3.9.",
+            "'encoding' is ignored and deprecated. It will be removed in Python 3.9",
             DeprecationWarning,
             stacklevel=2
         )
+        del kw['encoding']
 
     if (cls is None and object_hook is None and
             parse_int is None and parse_float is None and
