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

[eric.araujo]

http://hg.python.org/cpython/rev/6df109464e9d
changeset:   73330:6df109464e9d
parent:      73326:a1c17a5a460f
parent:      73329:3e4c0caf56a8
user:        Éric Araujo <merwok at netwok.org>
date:        Thu Nov 03 16:45:33 2011 +0100
summary:
  Merge 3.2

files:
  Lib/numbers.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/numbers.py b/Lib/numbers.py
--- a/Lib/numbers.py
+++ b/Lib/numbers.py
@@ -303,7 +303,7 @@
         raise NotImplementedError
 
     def __index__(self):
-        """someobject[self]"""
+        """Called whenever an index is needed, such as in slicing"""
         return int(self)
 
     @abstractmethod

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