traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge with 3.1

This commit is contained in:
Georg Brandl 2011-04-16 16:59:32 +02:00
parent a2860e8b51 340d2690b3
commit 10fe23b495
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Doc/library/json.rst
View File

@ -160,9 +160,10 @@ Basic Usage
.. 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.
Unlike :mod:`pickle` and :mod:`marshal`, JSON is not a framed protocol,
so trying to serialize multiple objects with repeated calls to
:func:`dump` using 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)