cpython: 1e315794ac8c (original) (raw)

Mercurial > cpython

changeset 69357:1e315794ac8c 3.2

#4783: Merge with 3.1. [#4783]

Ezio Melotti ezio.melotti@gmail.com
date	Fri, 15 Apr 2011 07:39:08 +0300
parents	d8f8e20719b8(current diff)2ec08aa2c566(diff)
children	91881e304e13 8025fb83dece
files	Doc/library/json.rst
diffstat	1 files changed, 5 insertions(+), 0 deletions(-)[+] [-] Doc/library/json.rst 5

line wrap: on

line diff

--- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -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[](#l1.9)

 trying to serialize more objects with repeated calls to :func:`dump` and[](#l1.10)

 the same *fp* will result in an invalid JSON file.[](#l1.11)

.. function:: load(fp, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw)