diff options
| author | Georg Brandl <georg@python.org> | 2011-04-16 14:59:32 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-04-16 14:59:32 (GMT) |
| commit | 10fe23b4954890c0e414438e026d1b36610ee668 (patch) | |
| tree | c56b09819288610667ca975cb4ad2a69d11b3873 /Doc/library/json.rst | |
| parent | a2860e8b51d24807f3ef1cf17b2055fac3b4dd3c (diff) | |
| parent | 340d2690b3db594edfa1eb27cda2afe957235ba6 (diff) | |
| download | cpython-10fe23b4954890c0e414438e026d1b36610ee668.zip cpython-10fe23b4954890c0e414438e026d1b36610ee668.tar.gz cpython-10fe23b4954890c0e414438e026d1b36610ee668.tar.bz2 | |
Merge with 3.1
Diffstat (limited to 'Doc/library/json.rst')
| -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 0db86be..dcd6973 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) |