Skip to content

gh-141510: Fix frozendict.items() ^ frozendict.items() #145535

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
Mar 5, 2026
Merged

gh-141510: Fix frozendict.items() ^ frozendict.items() #145535

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
13 changes: 13 additions & 0 deletions Lib/test/test_dict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1848,11 +1848,19 @@ def test_merge(self):
frozendict({'x': 1, 'y': 2}))
self.assertEqual(frozendict(x=1, y=2) | frozendict(y=5),
frozendict({'x': 1, 'y': 5}))
self.assertEqual(FrozenDict(x=1, y=2) | FrozenDict(y=5),
frozendict({'x': 1, 'y': 5}))

fd = frozendict(x=1, y=2)
self.assertIs(fd | frozendict(), fd)
self.assertIs(fd | {}, fd)
self.assertIs(frozendict() | fd, fd)

fd = FrozenDict(x=1, y=2)
self.assertEqual(fd | frozendict(), fd)
self.assertEqual(fd | {}, fd)
self.assertEqual(frozendict() | fd, fd)

def test_update(self):
# test "a |= b" operator
d = frozendict(x=1)
Expand All @@ -1863,6 +1871,11 @@ def test_update(self):
self.assertEqual(d, frozendict({'x': 1, 'y': 2}))
self.assertEqual(copy, frozendict({'x': 1}))

def test_items_xor(self):
# test "a ^ b" operator on items views
res = frozendict(a=1, b=2).items() ^ frozendict(b=2, c=3).items()
self.assertEqual(res, {('a', 1), ('c', 3)})

def test_repr(self):
d = frozendict()
self.assertEqual(repr(d), "frozendict()")
Expand Down
2 changes: 1 addition & 1 deletion Objects/dictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6523,7 +6523,7 @@ dictitems_xor_lock_held(PyObject *d1, PyObject *d2)
ASSERT_DICT_LOCKED(d1);
ASSERT_DICT_LOCKED(d2);

PyObject *temp_dict = copy_lock_held(d1, PyFrozenDict_Check(d1));
PyObject *temp_dict = copy_lock_held(d1, 0);
if (temp_dict == NULL) {
return NULL;
}
Expand Down
Loading