[Python-checkins] cpython (merge 3.2 -> default): Fix __hash__ in functools.cmp_to_key() to work with collections.Hashable.

[raymond.hettinger]

http://hg.python.org/cpython/rev/27e5c10ad0bf
changeset:   69811:27e5c10ad0bf
parent:      69809:847a38d787be
parent:      69810:2675415c57c1
user:        Raymond Hettinger <python at rcn.com>
date:        Tue May 03 11:16:36 2011 -0700
summary:
  Fix __hash__ in functools.cmp_to_key() to work with collections.Hashable.

files:
  Lib/functools.py           |  3 +--
  Lib/test/test_functools.py |  4 +++-
  Misc/NEWS                  |  2 ++
  3 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Lib/functools.py b/Lib/functools.py
--- a/Lib/functools.py
+++ b/Lib/functools.py
@@ -111,8 +111,7 @@
             return mycmp(self.obj, other.obj) >= 0
         def __ne__(self, other):
             return mycmp(self.obj, other.obj) != 0
-        def __hash__(self):
-            raise TypeError('hash not implemented')
+        __hash__ = None
     return K
 
 try:
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1,4 +1,5 @@
 import functools
+import collections
 import sys
 import unittest
 from test import support
@@ -510,6 +511,7 @@
         key = functools.cmp_to_key(mycmp)
         k = key(10)
         self.assertRaises(TypeError, hash, k)
+        self.assertNotIsInstance(k, collections.Hashable)
 
 class TestTotalOrdering(unittest.TestCase):
 
@@ -718,12 +720,12 @@
 
 def test_main(verbose=None):
     test_classes = (
-        TestCmpToKey,
         TestPartial,
         TestPartialSubclass,
         TestPythonPartial,
         TestUpdateWrapper,
         TestTotalOrdering,
+        TestCmpToKey,
         TestWraps,
         TestReduce,
         TestLRU,
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -141,6 +141,8 @@
 
 - logging: don't define QueueListener if Python has no thread support.
 
+- functools.cmp_to_key() now works with collections.Hashable().
+
 - Issue #11277: mmap.mmap() calls fcntl(fd, F_FULLFSYNC) on Mac OS X to get
   around a mmap bug with sparse files. Patch written by Steffen Daode Nurpmeso.
 

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