diff options
| author | Raymond Hettinger <python@rcn.com> | 2003-09-05 14:27:30 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2003-09-05 14:27:30 (GMT) |
| commit | b859c070efbf3c6fd5210c0ae0e4d5a3de4bf9b2 (patch) | |
| tree | 9f22bd1f76d59c4187760134b55237dc46accdc8 | |
| parent | a1a1dba2d48a92ccd49fe7529bd5a02b5ada1cb2 (diff) | |
| download | cpython-b859c070efbf3c6fd5210c0ae0e4d5a3de4bf9b2.zip cpython-b859c070efbf3c6fd5210c0ae0e4d5a3de4bf9b2.tar.gz cpython-b859c070efbf3c6fd5210c0ae0e4d5a3de4bf9b2.tar.bz2 | |
SF bug #800796: Difference between hash() and __hash__()
slice(5).__hash__() now raises a TypeError.
| -rw-r--r-- | Lib/test/test_slice.py | 5 | ||||
| -rw-r--r-- | Objects/sliceobject.c | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Lib/test/test_slice.py b/Lib/test/test_slice.py index d216c30..d8eb882 100644 --- a/Lib/test/test_slice.py +++ b/Lib/test/test_slice.py @@ -14,6 +14,11 @@ class SliceTest(unittest.TestCase): def test_repr(self): self.assertEqual(repr(slice(1, 2, 3)), "slice(1, 2, 3)") + def test_hash(self): + # Verify clearing of SF bug #800796 + self.assertRaises(TypeError, hash, slice(5)) + self.assertRaises(TypeError, slice(5).__hash__) + def test_cmp(self): s1 = slice(1, 2, 3) s2 = slice(1, 2, 3) diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c index 796df2b..c37af2b 100644 --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -278,6 +278,13 @@ slice_compare(PySliceObject *v, PySliceObject *w) return result; } +static long +slice_hash(PySliceObject *v) +{ + PyErr_SetString(PyExc_TypeError, "unhashable type"); + return -1L; +} + PyTypeObject PySlice_Type = { PyObject_HEAD_INIT(&PyType_Type) 0, /* Number of items for varobject */ @@ -293,7 +300,7 @@ PyTypeObject PySlice_Type = { 0, /* tp_as_number */ 0, /* tp_as_sequence */ 0, /* tp_as_mapping */ - 0, /* tp_hash */ + (hashfunc)slice_hash, /* tp_hash */ 0, /* tp_call */ 0, /* tp_str */ PyObject_GenericGetAttr, /* tp_getattro */ |