mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge with 3.2

Browse source
This commit is contained in:
Georg Brandl 2011-04-16 16:59:48 +02:00
commit d606ebe144
1 changed files with 4 additions and 3 deletions
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:: .. note::
Unlike :mod:`pickle` and :mod:`marshal`, JSON is not a framed protocol so Unlike :mod:`pickle` and :mod:`marshal`, JSON is not a framed protocol,
trying to serialize more objects with repeated calls to :func:`dump` and so trying to serialize multiple objects with repeated calls to
the same *fp* will result in an invalid JSON file. :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) .. function:: load(fp, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw)