Skip to content
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
3 changes: 1 addition & 2 deletions Lib/collections/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1163,8 +1163,7 @@ def __ror__(self, other):
if not isinstance(other, _collections_abc.Mapping):
return NotImplemented
m = dict(other)
for child in reversed(self.maps):
m.update(child)
m.update(self)
return self.__class__(m)


Expand Down
36 changes: 36 additions & 0 deletions Lib/test/test_collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,42 @@ def __ror__(self, other):
self.assertIs(type(tmp), SubclassRor)
self.assertIs(type(tmp.maps[0]), dict)

def test_reverse_union_with_counter(self):
left = {'shared': 99, 'left_only': 3}
front = Counter(front=2)
back = {'shadowed': 5, 'shared': 7, 'back': 9}
cm = ChainMap(front, back)

self.assertEqual(cm['shadowed'], 0)
result = left | cm
self.assertEqual(list(result.items()), [
('shared', 0), ('left_only', 3), ('shadowed', 0),
('back', 0), ('front', 2),
])
self.assertEqual(left, {'shared': 99, 'left_only': 3})
self.assertEqual(dict(front), {'front': 2})
self.assertEqual(back, {'shadowed': 5, 'shared': 7, 'back': 9})

def test_reverse_union_with_defaultdict(self):
left = {'shared': 99, 'left_only': 3}
front = collections.defaultdict(lambda: -1, {'front': 2})
back = {'shadowed': 5, 'shared': 7}
cm = ChainMap(front, back)

fresh_front = collections.defaultdict(lambda: -1, {'front': 2})
fresh = ChainMap(fresh_front, {'shadowed': 5, 'shared': 7})
self.assertEqual(fresh['shadowed'], -1)
self.assertEqual(fresh['shared'], -1)
self.assertEqual(fresh_front, {'front': 2, 'shadowed': -1, 'shared': -1})

result = left | cm
self.assertEqual(list(result.items()), [
('shared', -1), ('left_only', 3), ('shadowed', -1), ('front', 2),
])
self.assertEqual(left, {'shared': 99, 'left_only': 3})
self.assertEqual(front, {'front': 2, 'shadowed': -1, 'shared': -1})
self.assertEqual(back, {'shadowed': 5, 'shared': 7})


################################################################################
### Named Tuples
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix reverse union with :class:`~collections.ChainMap` to preserve its lookup
semantics for defaulting mappings such as :class:`~collections.Counter` and
:class:`~collections.defaultdict`.
Loading