summaryrefslogtreecommitdiffstats
path: root/Lib/json/decoder.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-02 20:16:18 (GMT)
committerGeorg Brandl <georg@python.org>2010-08-02 20:16:18 (GMT)
commitc8284cfc572fbaadb1f436aac4480a3f386bba54 (patch)
treea0367e9df40275fc72d7fb6045d8d2b995f368d4 /Lib/json/decoder.py
parent8477f82c3e864cf0e1970b37afde82576cce8d06 (diff)
downloadcpython-c8284cfc572fbaadb1f436aac4480a3f386bba54.zip
cpython-c8284cfc572fbaadb1f436aac4480a3f386bba54.tar.gz
cpython-c8284cfc572fbaadb1f436aac4480a3f386bba54.tar.bz2
#9087: update json docstrings -- unicode and long do not exist anymore.
Diffstat (limited to 'Lib/json/decoder.py')
-rw-r--r--Lib/json/decoder.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py
index 475b390..3e7405b 100644
--- a/Lib/json/decoder.py
+++ b/Lib/json/decoder.py
@@ -263,9 +263,9 @@ class JSONDecoder(object):
+---------------+-------------------+
| array | list |
+---------------+-------------------+
- | string | unicode |
+ | string | str |
+---------------+-------------------+
- | number (int) | int, long |
+ | number (int) | int |
+---------------+-------------------+
| number (real) | float |
+---------------+-------------------+
@@ -318,8 +318,8 @@ class JSONDecoder(object):
def decode(self, s, _w=WHITESPACE.match):
- """Return the Python representation of ``s`` (a ``str`` or ``unicode``
- instance containing a JSON document)
+ """Return the Python representation of ``s`` (a ``str`` instance
+ containing a JSON document).
"""
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
@@ -329,8 +329,8 @@ class JSONDecoder(object):
return obj
def raw_decode(self, s, idx=0):
- """Decode a JSON document from ``s`` (a ``str`` or ``unicode``
- beginning with a JSON document) and return a 2-tuple of the Python
+ """Decode a JSON document from ``s`` (a ``str`` beginning with
+ a JSON document) and return a 2-tuple of the Python
representation and the index in ``s`` where the document ended.
This can be used to decode a JSON document from a string that may