mirror of https://github.com/django/django.git
Fixed #20276 -- Implemented __bool__ for MergeDict
MergeDict evaluates now to False if all contained dicts are empty. Thanks til for the report and the initial patch.
This commit is contained in:
parent
bfe25de429
commit
59d127e45f
|
@ -14,6 +14,12 @@ class MergeDict(object):
|
|||
def __init__(self, *dicts):
|
||||
self.dicts = dicts
|
||||
|
||||
def __bool__(self):
|
||||
return any(self.dicts)
|
||||
|
||||
def __nonzero__(self):
|
||||
return type(self).__bool__(self)
|
||||
|
||||
def __getitem__(self, key):
|
||||
for dict_ in self.dicts:
|
||||
try:
|
||||
|
|
|
@ -203,6 +203,13 @@ class MergeDictTests(SimpleTestCase):
|
|||
('key2', ['value2', 'value3']),
|
||||
('key4', ['value5', 'value6'])])
|
||||
|
||||
def test_bool_casting(self):
|
||||
empty = MergeDict({}, {}, {})
|
||||
not_empty = MergeDict({}, {}, {"key": "value"})
|
||||
self.assertFalse(empty)
|
||||
self.assertTrue(not_empty)
|
||||
|
||||
|
||||
class MultiValueDictTests(SimpleTestCase):
|
||||
|
||||
def test_multivaluedict(self):
|
||||
|
|
Loading…
Reference in New Issue