summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-11-12 22:48:33 +0200
committerSerhiy Storchaka <storchaka@gmail.com>2016-11-12 22:48:33 +0200
commit58d3e54556a97c92ea8720691f534f71281c9f2c (patch)
tree5841c52f2b3a93d6f77402b3520e1f1b9e7e459d
parentbabe4f8e5ede1f9a6f4206b97c303c8d33346b3b (diff)
parent022371ff945a4d0012cdcdc209031a132e43a5c9 (diff)
downloadcpython-git-58d3e54556a97c92ea8720691f534f71281c9f2c.tar.gz
Fixed the documentation of parse_constant argument in json.load().
parse_constant doesn't get called on 'null', 'true', 'false' since 3.1/2.7.
-rw-r--r--Doc/library/json.rst4
-rw-r--r--Lib/json/__init__.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index 033e3fc41e..200fa14740 100644
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -339,8 +339,8 @@ Encoders and Decoders
(e.g. :class:`float`).
*parse_constant*, if specified, will be called with one of the following
- strings: ``'-Infinity'``, ``'Infinity'``, ``'NaN'``, ``'null'``, ``'true'``,
- ``'false'``. This can be used to raise an exception if invalid JSON numbers
+ strings: ``'-Infinity'``, ``'Infinity'``, ``'NaN'``.
+ This can be used to raise an exception if invalid JSON numbers
are encountered.
If *strict* is false (``True`` is the default), then control characters
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
index 94397aa4e9..b8d5e6cff8 100644
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -328,7 +328,7 @@ def loads(s, *, encoding=None, cls=None, object_hook=None, parse_float=None,
for JSON integers (e.g. float).
``parse_constant``, if specified, will be called with one of the
- following strings: -Infinity, Infinity, NaN, null, true, false.
+ following strings: -Infinity, Infinity, NaN.
This can be used to raise an exception if invalid JSON numbers
are encountered.