Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

#4783: Merge with 3.1.

This commit is contained in:
Ezio Melotti 2011-04-15 07:39:08 +03:00
parent d211231cd5 60adf95955
commit 34d204bc85
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Doc/library/json.rst
View File

@ -158,6 +158,11 @@ Basic Usage
Serialize *obj* to a JSON formatted :class:`str`. The arguments have the
same meaning as in :func:`dump`.
.. note::
Unlike :mod:`pickle` and :mod:`marshal`, JSON is not a framed protocol so
trying to serialize more objects with repeated calls to :func:`dump` and
the same *fp* will result in an invalid JSON file.
.. function:: load(fp, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw)