Skip to content

[3.15] gh-141510 Add frozendict fast paths to abstract.c (GH-150692) #151704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Jun 19, 2026
Merged

[3.15] gh-141510 Add frozendict fast paths to abstract.c (GH-150692) #151704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
gh-141510 Add frozendict fast paths to abstract.c (GH-150692) 
Add frozendict to the fast paths of PyMapping_GetOptionalItem(),
PyMapping_Keys(), PyMapping_Values(), and PyMapping_Items().
(cherry picked from commit a5568d0)

Co-authored-by: da-woods <dw-git@d-woods.co.uk>
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
  • Loading branch information
@da-woods @blurb-it @miss-islington
2 people authored and miss-islington committed Jun 19, 2026
commit 5323da4b8179b9e7fcc2be364f49be0b7d335cc0
14 changes: 13 additions & 1 deletion Lib/test/test_capi/test_abstract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,11 @@ def test_mapping_getoptionalitem(self):
self.assertEqual(getitem(dct2, 'a'), 1)
self.assertEqual(getitem(dct2, 'b'), KeyError)

frozendct = frozendict(dct)
self.assertEqual(getitem(frozendct, 'a'), 1)
self.assertEqual(getitem(frozendct, 'b'), KeyError)
self.assertEqual(getitem(frozendct, '\U0001f40d'), 2)

self.assertEqual(getitem(['a', 'b', 'c'], 1), 'b')

self.assertRaises(TypeError, getitem, 42, 'a')
Expand All @@ -431,6 +436,11 @@ def test_mapping_getoptionalitemstring(self):
self.assertEqual(getitemstring(dct2, b'a'), 1)
self.assertEqual(getitemstring(dct2, b'b'), KeyError)

frozendct = frozendict(dct)
self.assertEqual(getitemstring(frozendct, 'a'), 1)
self.assertEqual(getitemstring(frozendct, 'b'), KeyError)
self.assertEqual(getitemstring(frozendct, '\U0001f40d'.encode()), 2)

self.assertRaises(TypeError, getitemstring, 42, b'a')
self.assertRaises(UnicodeDecodeError, getitemstring, {}, b'\xff')
self.assertRaises(SystemError, getitemstring, {}, NULL)
Expand Down Expand Up @@ -677,8 +687,10 @@ def items(self):
dict_obj = {'foo': 1, 'bar': 2, 'spam': 3}

for mapping in [{}, OrderedDict(), Mapping1(), Mapping2(),
frozendict(),
dict_obj, OrderedDict(dict_obj),
Mapping1(dict_obj), Mapping2(dict_obj)]:
Mapping1(dict_obj), Mapping2(dict_obj),
frozendict(dict_obj)]:
self.assertListEqual(_testlimitedcapi.mapping_keys(mapping),
list(mapping.keys()))
self.assertListEqual(_testlimitedcapi.mapping_values(mapping),
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/C_API/2026-06-18-18-24-11.gh-issue-141510.-EOHJ1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add :class:`frozendict` to the fast paths of :c:func:`PyMapping_GetOptionalItem`, :c:func:`PyMapping_Keys`, :c:func:`PyMapping_Values`, and :c:func:`PyMapping_Items`.
8 changes: 4 additions & 4 deletions Objects/abstract.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ PyObject_GetItem(PyObject *o, PyObject *key)
int
PyMapping_GetOptionalItem(PyObject *obj, PyObject *key, PyObject **result)
{
if (PyDict_CheckExact(obj)) {
if (PyAnyDict_CheckExact(obj)) {
return PyDict_GetItemRef(obj, key, result);
}

Expand Down Expand Up @@ -2462,7 +2462,7 @@ PyMapping_Keys(PyObject *o)
if (o == NULL) {
return null_error();
}
if (PyDict_CheckExact(o)) {
if (PyAnyDict_CheckExact(o)) {
return PyDict_Keys(o);
}
return method_output_as_list(o, &_Py_ID(keys));
Expand All @@ -2474,7 +2474,7 @@ PyMapping_Items(PyObject *o)
if (o == NULL) {
return null_error();
}
if (PyDict_CheckExact(o)) {
if (PyAnyDict_CheckExact(o)) {
return PyDict_Items(o);
}
return method_output_as_list(o, &_Py_ID(items));
Expand All @@ -2486,7 +2486,7 @@ PyMapping_Values(PyObject *o)
if (o == NULL) {
return null_error();
}
if (PyDict_CheckExact(o)) {
if (PyAnyDict_CheckExact(o)) {
return PyDict_Values(o);
}
return method_output_as_list(o, &_Py_ID(values));
Expand Down
Loading