diff options
| author | Georg Brandl <georg@python.org> | 2011-04-16 16:59:48 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-04-16 16:59:48 +0200 |
| commit | d606ebe144452fcdd0aa13ef2e9737df36b8cd63 (patch) | |
| tree | fbaf902fb7c216d22690aa8344923d70cce3fcc0 | |
| parent | 69518bc765381cd088934f499680b9a3ad75bcaa (diff) | |
| parent | 10fe23b4954890c0e414438e026d1b36610ee668 (diff) | |
| download | cpython-git-d606ebe144452fcdd0aa13ef2e9737df36b8cd63.tar.gz | |
Merge with 3.2
| -rw-r--r-- | Doc/library/json.rst | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst index 0db86be82e..dcd6973e2b 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -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) |