Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions 4 Lib/collections/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions 4 Lib/test/test_userdict.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'})
Expand Down Expand Up @@ -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'})
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add support for merging :class:`collections.UserDict` and :class:`frozendict`.
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.