#4783: Merge with 3.1.
This commit is contained in:
commit
34d204bc85
|
@ -158,6 +158,11 @@ Basic Usage
|
||||||
Serialize *obj* to a JSON formatted :class:`str`. The arguments have the
|
Serialize *obj* to a JSON formatted :class:`str`. The arguments have the
|
||||||
same meaning as in :func:`dump`.
|
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)
|
.. function:: load(fp, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue