From 705988056e028bab3dbc5cff3671a8ddefc88ec7 Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
<31488909+miss-islington@users.noreply.github.com>
Date: Fri, 16 Jul 2021 02:02:59 -0700
Subject: bpo-44646: Fix the hash of the union type. (GH-27179) (#27180)
It no longer depends on the order of arguments.
hash(int | str) == hash(str | int)
Co-authored-by: Jack DeVries <58614260+jdevries3133@users.noreply.github.com>
(cherry picked from commit aeaa553d650786afc6e68df1f4813ae1a5b71d05)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---
Lib/test/test_types.py | 4 ++++
.../Core and Builtins/2021-07-16-09-59-13.bpo-44646.Yb6s05.rst | 2 ++
Objects/unionobject.c | 10 ++++++----
3 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 Misc/NEWS.d/next/Core and Builtins/2021-07-16-09-59-13.bpo-44646.Yb6s05.rst
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index 3f76771..bb50412 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -663,6 +663,10 @@ class TypesTests(unittest.TestCase):
x.__args__ = [str, int]
(int | str ) == x
+ def test_hash(self):
+ self.assertEqual(hash(int | str), hash(str | int))
+ self.assertEqual(hash(int | str), hash(typing.Union[int, str]))
+
def test_instancecheck(self):
x = int | str
self.assertIsInstance(1, x)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-16-09-59-13.bpo-44646.Yb6s05.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-16-09-59-13.bpo-44646.Yb6s05.rst
new file mode 100644
index 0000000..0e28eac
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-07-16-09-59-13.bpo-44646.Yb6s05.rst
@@ -0,0 +1,2 @@
+Fix the hash of the union type: it no longer depends on the order of
+arguments.
diff --git a/Objects/unionobject.c b/Objects/unionobject.c
index 229b518..762df5d 100644
--- a/Objects/unionobject.c
+++ b/Objects/unionobject.c
@@ -33,11 +33,13 @@ static Py_hash_t
union_hash(PyObject *self)
{
unionobject *alias = (unionobject *)self;
- Py_hash_t h1 = PyObject_Hash(alias->args);
- if (h1 == -1) {
- return -1;
+ PyObject *args = PyFrozenSet_New(alias->args);
+ if (args == NULL) {
+ return (Py_hash_t)-1;
}
- return h1;
+ Py_hash_t hash = PyObject_Hash(args);
+ Py_DECREF(args);
+ return hash;
}
static int
--
cgit v0.12