Merge 3.4.0b2 release revisions back into mainline.

This commit is contained in:
Larry Hastings 2014-01-06 07:24:19 -08:00
commit b7f5dcadf2
7 changed files with 86 additions and 18 deletions

View file

@ -2080,9 +2080,17 @@ left undefined.
.. method:: object.__index__(self)
Called to implement :func:`operator.index`. Also called whenever Python needs
an integer object (such as in slicing, or in the built-in :func:`bin`,
:func:`hex` and :func:`oct` functions). Must return an integer.
Called to implement :func:`operator.index`, and whenever Python needs to
losslessly convert the numeric object to an integer object (such as in
slicing, or in the built-in :func:`bin`, :func:`hex` and :func:`oct`
functions). Presence of this method indicates that the numeric object is
an integer type. Must return an integer.
.. note::
When :meth:`__index__` is defined, :meth:`__int__` should also be defined,
and both shuld return the same value, in order to have a coherent integer
type class.
.. _context-managers: