[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

benjamin.peterson python-checkins at python.org
Sat Jul 30 17:00:20 CEST 2011


http://hg.python.org/cpython/rev/895831b940bd
changeset:   71638:895831b940bd
parent:      71632:8d1a046441ea
parent:      71634:99e9816b7d8b
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Jul 30 10:00:02 2011 -0500
summary:
  merge 3.2

files:
  Doc/library/stdtypes.rst |  10 ++++++++++
  1 files changed, 10 insertions(+), 0 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2723,6 +2723,16 @@
 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
 --------------
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list