merge 3.2 (#13259)

benjaminp · benjaminp · commit 3ed559a3c753 · 2011-10-25T00:04:10.000-04:00
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
@@ -1157,6 +1157,14 @@ Basic customization
    .. XXX what about subclasses of string?
 
 
+.. method:: object.__bytes__(self)
+
+   .. index:: builtin: bytes
+
+   Called by :func:`bytes` to compute a byte-string representation of an
+   object. This should return a ``bytes`` object.
+
+
 .. method:: object.__format__(self, format_spec)
 
    .. index::
