diff options
author | Benjamin Peterson <benjamin@python.org> | 2012-02-21 02:44:56 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2012-02-21 02:44:56 (GMT) |
commit | aee9dfba4a9230f2832dd69d67e92f8e0490a163 (patch) | |
tree | 27a9896969ac7ff79dc75017cff121a077c3eb6e /Doc/reference | |
parent | 34b345b8885e5db8ab6627c081ca86a8b78b6989 (diff) | |
parent | b19fb2462eac776746f6cb40cc84b0587c83b9bc (diff) | |
download | cpython-aee9dfba4a9230f2832dd69d67e92f8e0490a163.zip cpython-aee9dfba4a9230f2832dd69d67e92f8e0490a163.tar.gz cpython-aee9dfba4a9230f2832dd69d67e92f8e0490a163.tar.bz2 |
merge 2.6 with hash randomization fix
Diffstat (limited to 'Doc/reference')
-rw-r--r-- | Doc/reference/datamodel.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 0cd4c62..0d87873 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1282,6 +1282,8 @@ Basic customization modules are still available at the time when the :meth:`__del__` method is called. + See also the :option:`-R` command-line option. + .. method:: object.__repr__(self) |