merge 3.2 (#13259)

2011-10-25 00:04:10 -04:00 · 2011-10-25 00:04:10 -04:00 · 3ed559a3c7
parent b4d8e912d7 1fafc1a11f
commit 3ed559a3c7
1 changed files with 8 additions and 0 deletions
--- 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::