| commit | c801ad36ee9730e7a066ffb2ee2636684527d24b | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Tue Oct 25 00:06:15 2011 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Tue Oct 25 00:06:15 2011 -0400 |
| tree | ac22e3fc8dce8253e903f05236ddba4c88842129 | |
| parent | 3ed559a3c7530fa6d580a7f204d162a448cbb948 [diff] | |
| parent | b528fcf9540dc2db5217e3388e9fc81dce08b70f [diff] |
merge heads
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index e628a02..09e168e 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst
@@ -1157,6 +1157,14 @@ .. 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::