Skip to content

gh-145056: Fix merging of OrderedDict and UserDict with frozendict #146295

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

Closed
serhiy-storchaka wants to merge 5 commits into from
+12 −8
Closed

gh-145056: Fix merging of OrderedDict and UserDict with frozendict #146295

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f27f128
gh-145056: Let dict specific tests accept frozendict as well
rhettinger Feb 21, 2026
4d02992
Add tests
rhettinger Feb 21, 2026
a887273
Expand the fast path in the C version of OrderedDict
rhettinger Feb 21, 2026
f66f9a1
Merge branch 'main' into collections_any_dict
serhiy-storchaka Mar 22, 2026
5f32ed5
Add tests and fix OrderedDict | frozendict.
serhiy-storchaka Mar 22, 2026
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
Next Next commit
gh-145056: Let dict specific tests accept frozendict as well
  • Loading branch information
@rhettinger
rhettinger committed Feb 21, 2026
commit f27f128ab9ddcecee092e4f9ff61b9f95b2d505d
8 changes: 4 additions & 4 deletions Lib/collections/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,14 @@ def __ior__(self, other):
return self

def __or__(self, other):
if not isinstance(other, dict):
if not isinstance(other, (dict, frozendict)):
return NotImplemented
new = self.__class__(self)
new.update(other)
return new

def __ror__(self, other):
if not isinstance(other, dict):
if not isinstance(other, (dict, frozendict)):
return NotImplemented
new = self.__class__(other)
new.update(self)
Expand Down Expand Up @@ -1221,14 +1221,14 @@ def __repr__(self):
def __or__(self, other):
if isinstance(other, UserDict):
return self.__class__(self.data | other.data)
if isinstance(other, dict):
if isinstance(other, (dict, frozendict)):
return self.__class__(self.data | other)
return NotImplemented

def __ror__(self, other):
if isinstance(other, UserDict):
return self.__class__(other.data | self.data)
if isinstance(other, dict):
if isinstance(other, (dict, frozendict)):
return self.__class__(other | self.data)
return NotImplemented

Expand Down
Loading