merge 3.2 (#13259)

3ed559a3 · Benjamin Peterson · b4d8e912 · 1fafc1a1 · 3ed559a3
Commit 3ed559a3 authored Oct 25, 2011 by Benjamin Peterson
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

Doc/reference/datamodel.rst Doc/reference/datamodel.rst +8 -0

No files found.
--- 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::