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.
........

1 files changed, 8 insertions, 6 deletions

diff --git a/Doc/library/marshal.rst b/Doc/library/marshal.rst
index 7e1daf3..3b9e3d2 100644
--- a/Doc/library/marshal.rst
+++ b/Doc/library/marshal.rst
@@ -36,12 +36,14 @@ supports a substantially wider range of objects than marshal.
 
 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.