[Python-checkins] cpython (merge 3.2 -> default): #14692 Fix json docs to reflect changes in json.load

[hynek.schlawack]

http://hg.python.org/cpython/rev/0f6a6f59b002
changeset:   77002:0f6a6f59b002
parent:      76999:0a1d7be10946
parent:      77001:4f27c4dc34ed
user:        Hynek Schlawack <hs at ox.cx>
date:        Wed May 16 19:08:36 2012 +0200
summary:
  #14692 Fix json docs to reflect changes in json.load

The behaviour of the parse_constant callback changed insofar that 'null',
'true', 'false' don't trigger its call anymore.

Patch by Serhiy Storchaka

files:
  Doc/library/json.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -209,8 +209,8 @@
    (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.
 
    To use a custom :class:`JSONDecoder` subclass, specify it with the ``cls``

-- 
Repository URL: http://hg.python.org/cpython