mirror of https://github.com/python/cpython
bpo-44704: Make Set._hash consistent with frozenset.__hash__ (GH-27281)
This commit is contained in:
parent
ab7fcc8fbd
commit
c878f5d817
|
@ -696,6 +696,7 @@ class Set(Collection):
|
|||
hx = hash(x)
|
||||
h ^= (hx ^ (hx << 16) ^ 89869747) * 3644798167
|
||||
h &= MASK
|
||||
h ^= (h >> 11) ^ (h >> 25)
|
||||
h = h * 69069 + 907133923
|
||||
h &= MASK
|
||||
if h > MAX:
|
||||
|
|
|
@ -1801,6 +1801,18 @@ class TestCollectionABCs(ABCTestCase):
|
|||
self.assertTrue(f1 != l1)
|
||||
self.assertTrue(f1 != l2)
|
||||
|
||||
def test_Set_hash_matches_frozenset(self):
|
||||
sets = [
|
||||
{}, {1}, {None}, {-1}, {0.0}, {"abc"}, {1, 2, 3},
|
||||
{10**100, 10**101}, {"a", "b", "ab", ""}, {False, True},
|
||||
{object(), object(), object()}, {float("nan")}, {frozenset()},
|
||||
{*range(1000)}, {*range(1000)} - {100, 200, 300},
|
||||
{*range(sys.maxsize - 10, sys.maxsize + 10)},
|
||||
]
|
||||
for s in sets:
|
||||
fs = frozenset(s)
|
||||
self.assertEqual(hash(fs), Set._hash(fs), msg=s)
|
||||
|
||||
def test_Mapping(self):
|
||||
for sample in [dict]:
|
||||
self.assertIsInstance(sample(), Mapping)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
The implementation of ``collections.abc.Set._hash()`` now matches that of ``frozenset.__hash__()``.
|
Loading…
Reference in New Issue