summaryrefslogtreecommitdiffstats
path: root/Lib/json/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/json/__init__.py')
-rw-r--r--Lib/json/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
index d71c2ce..a746f9c 100644
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -298,6 +298,8 @@ def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None,
To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``
kwarg; otherwise ``JSONDecoder`` is used.
+ The ``encoding`` argument is ignored and deprecated.
+
"""
if (cls is None and object_hook is None and
parse_int is None and parse_float is None and