diff options
| author | Georg Brandl <georg@python.org> | 2010-08-02 20:16:18 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-02 20:16:18 (GMT) |
| commit | c8284cfc572fbaadb1f436aac4480a3f386bba54 (patch) | |
| tree | a0367e9df40275fc72d7fb6045d8d2b995f368d4 /Lib/json/encoder.py | |
| parent | 8477f82c3e864cf0e1970b37afde82576cce8d06 (diff) | |
| download | cpython-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/encoder.py')
| -rw-r--r-- | Lib/json/encoder.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py index d068e72..1335985 100644 --- a/Lib/json/encoder.py +++ b/Lib/json/encoder.py @@ -77,9 +77,9 @@ class JSONEncoder(object): +-------------------+---------------+ | list, tuple | array | +-------------------+---------------+ - | str, unicode | string | + | str | string | +-------------------+---------------+ - | int, long, float | number | + | int, float | number | +-------------------+---------------+ | True | true | +-------------------+---------------+ @@ -102,12 +102,12 @@ class JSONEncoder(object): """Constructor for JSONEncoder, with sensible defaults. If skipkeys is false, then it is a TypeError to attempt - encoding of keys that are not str, int, long, float or None. If + encoding of keys that are not str, int, float or None. If skipkeys is True, such items are simply skipped. If ensure_ascii is true, the output is guaranteed to be str - objects with all incoming unicode characters escaped. If - ensure_ascii is false, the output will be unicode object. + objects with all incoming non-ASCII characters escaped. If + ensure_ascii is false, the output can contain non-ASCII characters. If check_circular is true, then lists, dicts, and custom encoded objects will be checked for circular references during encoding to |