summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2011-05-03 18:16:36 (GMT)
committerRaymond Hettinger <python@rcn.com>2011-05-03 18:16:36 (GMT)
commite7a2430ddedd3d236e1741b047d133cf461eb0de (patch)
tree6abec258ede9b5b31d05211430620c606fc5ad21 /Lib/test
parent4e787aeed6079bc3ddda13be8b18a4e8992cd561 (diff)
parent003be529323a395be4a17c779aff7e4737170bbf (diff)
downloadcpython-e7a2430ddedd3d236e1741b047d133cf461eb0de.zip
cpython-e7a2430ddedd3d236e1741b047d133cf461eb0de.tar.gz
cpython-e7a2430ddedd3d236e1741b047d133cf461eb0de.tar.bz2
Fix __hash__ in functools.cmp_to_key() to work with collections.Hashable.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_functools.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index c50336e..97d7524 100644
--- 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 @@ class TestCmpToKey(unittest.TestCase):
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 @@ class TestLRU(unittest.TestCase):
def test_main(verbose=None):
test_classes = (
- TestCmpToKey,
TestPartial,
TestPartialSubclass,
TestPythonPartial,
TestUpdateWrapper,
TestTotalOrdering,
+ TestCmpToKey,
TestWraps,
TestReduce,
TestLRU,