merge 3.2

This commit is contained in:
Benjamin Peterson 2011-07-30 10:00:02 -05:00
commit 7f94febd74

View File

@ -2723,6 +2723,16 @@ special operations. There is exactly one ellipsis object, named
It is written as ``Ellipsis`` or ``...``.
The NotImplemented Object
-------------------------
This object is returned from comparisons and binary operations when they are
asked to operate on types they don't support. See :ref:`comparisons` for more
information.
It is written as ``NotImplemented``.
Boolean Values
--------------