Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-04-15 08:11:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-145056: Add support for merging collections.UserDict and frozendict (GH-146465)

Browse source
This commit is contained in:
Serhiy Storchaka 2026-03-30 22:07:28 +03:00 • committed by GitHub
parent 727890410b
commit ec2bc12e54
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/collections/__init__.py
View file

@ -1216,14 +1216,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

4
Lib/test/test_userdict.py
View file

@ -245,7 +245,7 @@ class G(collections.UserDict):
test_repr_deep = mapping_tests.TestHashMappingProtocol.test_repr_deep
def test_mixed_or(self):
for t in UserDict, dict, types.MappingProxyType:
for t in UserDict, dict, frozendict, types.MappingProxyType:
with self.subTest(t.__name__):
u = UserDict({0: 'a', 1: 'b'}) | t({1: 'c', 2: 'd'})
self.assertEqual(u, {0: 'a', 1: 'c', 2: 'd'})
@ -276,7 +276,7 @@ def test_mixed_or(self):
self.assertIs(type(u), UserDictSubclass)
def test_mixed_ior(self):
for t in UserDict, dict, types.MappingProxyType:
for t in UserDict, dict, frozendict, types.MappingProxyType:
with self.subTest(t.__name__):
u = u2 = UserDict({0: 'a', 1: 'b'})
u |= t({1: 'c', 2: 'd'})

1
Misc/NEWS.d/next/Library/2026-03-26-14-44-07.gh-issue-145056.L9KPC3.rst Normal file
View file

@ -0,0 +1 @@
Add support for merging :class:`collections.UserDict` and :class:`frozendict`.