diff options
| -rw-r--r-- | Doc/library/types.rst | 6 | ||||
| -rw-r--r-- | Doc/whatsnew/3.12.rst | 3 | ||||
| -rw-r--r-- | Lib/test/test_types.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2022-06-25-10-19-43.gh-issue-87995.aMDHnp.rst | 2 | ||||
| -rw-r--r-- | Objects/descrobject.c | 8 |
5 files changed, 28 insertions, 1 deletions
diff --git a/Doc/library/types.rst b/Doc/library/types.rst index e0e77df..cce0ad9 100644 --- a/Doc/library/types.rst +++ b/Doc/library/types.rst @@ -417,6 +417,12 @@ Standard names are defined for the following types: .. versionadded:: 3.9 + .. describe:: hash(proxy) + + Return a hash of the underlying mapping. + + .. versionadded:: 3.12 + Additional Utility Classes and Functions ---------------------------------------- diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst index 0a4d498..11e8b87 100644 --- a/Doc/whatsnew/3.12.rst +++ b/Doc/whatsnew/3.12.rst @@ -79,6 +79,9 @@ New Features Other Language Changes ====================== +* :class:`types.MappingProxyType` instances are now hashable if the underlying + mapping is hashable. + (Contributed by Serhiy Storchaka in :gh:`87995`.) New Modules diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index 8556ca3..f00da0a 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -1203,6 +1203,16 @@ class MappingProxyTests(unittest.TestCase): self.assertDictEqual(mapping, {'a': 0, 'b': 1, 'c': 2}) self.assertDictEqual(other, {'c': 3, 'p': 0}) + def test_hash(self): + class HashableDict(dict): + def __hash__(self): + return 3844817361 + view = self.mappingproxy({'a': 1, 'b': 2}) + self.assertRaises(TypeError, hash, view) + mapping = HashableDict({'a': 1, 'b': 2}) + view = self.mappingproxy(mapping) + self.assertEqual(hash(view), hash(mapping)) + class ClassCreationTests(unittest.TestCase): diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-25-10-19-43.gh-issue-87995.aMDHnp.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-25-10-19-43.gh-issue-87995.aMDHnp.rst new file mode 100644 index 0000000..4154ebc --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-25-10-19-43.gh-issue-87995.aMDHnp.rst @@ -0,0 +1,2 @@ +:class:`types.MappingProxyType` instances are now hashable if the underlying +mapping is hashable. diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 8ef6a82..82570e0 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -1178,6 +1178,12 @@ mappingproxy_getiter(mappingproxyobject *pp) return PyObject_GetIter(pp->mapping); } +static Py_hash_t +mappingproxy_hash(mappingproxyobject *pp) +{ + return PyObject_Hash(pp->mapping); +} + static PyObject * mappingproxy_str(mappingproxyobject *pp) { @@ -1901,7 +1907,7 @@ PyTypeObject PyDictProxy_Type = { &mappingproxy_as_number, /* tp_as_number */ &mappingproxy_as_sequence, /* tp_as_sequence */ &mappingproxy_as_mapping, /* tp_as_mapping */ - 0, /* tp_hash */ + (hashfunc)mappingproxy_hash, /* tp_hash */ 0, /* tp_call */ (reprfunc)mappingproxy_str, /* tp_str */ PyObject_GenericGetAttr, /* tp_getattro */ |