[Python-checkins] cpython (merge 3.2 -> default): #4783: Merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/91881e304e13
changeset:   69358:91881e304e13
parent:      69353:3ca13a65b90f
parent:      69357:1e315794ac8c
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Apr 15 07:40:37 2011 +0300
summary:
  #4783: Merge with 3.2.

files:
  Doc/library/json.rst |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -158,6 +158,11 @@
    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)
 

-- 
Repository URL: http://hg.python.org/cpython