summaryrefslogtreecommitdiff
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-04-15 07:39:08 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2011-04-15 07:39:08 +0300
commit34d204bc85074a96754e4cd1f23f1c148d0d9aaa (patch)
treea8596b0913dc561ee5e54b8ea54604b49e9d845a /Doc
parentd211231cd51924954c1811ebf271c4499b1323b1 (diff)
parent60adf9595592a84c1108ab984d81397c0a5c613d (diff)
downloadcpython-git-34d204bc85074a96754e4cd1f23f1c148d0d9aaa.tar.gz
#4783: Merge with 3.1.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/json.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index 9064409f98..0db86be82e 100644
--- 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
+ 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)