[Python-checkins] r74634 - in python/branches/py3k: Doc/library/marshal.rst

[georg.brandl]

Author: georg.brandl
Date: Thu Sep  3 14:34:10 2009
New Revision: 74634

Log:
Merged revisions 74633 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74633 | georg.brandl | 2009-09-03 14:31:39 +0200 (Do, 03 Sep 2009) | 1 line
  
  #6757: complete the list of types that marshal can serialize.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/marshal.rst

Modified: python/branches/py3k/Doc/library/marshal.rst
==============================================================================
--- python/branches/py3k/Doc/library/marshal.rst	(original)
+++ python/branches/py3k/Doc/library/marshal.rst	Thu Sep  3 14:34:10 2009
@@ -36,12 +36,14 @@
 
 Not all Python object types are supported; in general, only objects whose value
 is independent from a particular invocation of Python can be written and read by
-this module.  The following types are supported: ``None``, integers,
-floating point numbers, strings, bytes, bytearrays, tuples, lists, sets,
-dictionaries, and code objects, where it should be understood that tuples, lists
-and dictionaries are only supported as long as the values contained therein are
-themselves supported; and recursive lists and dictionaries should not be written
-(they will cause infinite loops).
+this module.  The following types are supported: booleans, integers, floating
+point numbers, complex numbers, strings, bytes, bytearrays, tuples, lists, sets,
+frozensets, dictionaries, and code objects, where it should be understood that
+tuples, lists, sets, frozensets and dictionaries are only supported as long as
+the values contained therein are themselves supported; and recursive lists, sets
+and dictionaries should not be written (they will cause infinite loops).  The
+singletons :const:`None`, :const:`Ellipsis` and :exc:`StopIteration` can also be
+marshalled and unmarshalled.
 
 There are functions that read/write files as well as functions operating on
 strings.