Ticket #6465: 6465-1.diff

django/utils/datastructures.py

@@ -25 +25 @@
 
     def getlist(self, key):
         for dict_ in self.dicts:
-            try:
+            if key in dict_.keys():
                 return dict_.getlist(key)
-            except KeyError:
-                pass
-        raise KeyError
+        return []
 
     def items(self):
         item_list = []

tests/regressiontests/datastructures/tests.py

@@ -20 +20 @@
 >>> md2['chris']
 'cool'
 
+MergeDict can merge MultiValueDicts
+>>> multi1 = MultiValueDict({'key1': ['value1'], 'key2': ['value2', 'value3']})
+>>> multi2 = MultiValueDict({'key3': ['value4'], 'key4': ['value5', 'value6']})
+>>> mm = MergeDict(multi1, multi2)
+>>> mm.getlist('key2')
+['value2', 'value3']
+>>> mm.getlist('key4')
+['value5', 'value6']
+>>> mm.getlist('undefined')
+[]
+
 ### MultiValueDict ##########################################################
 
 >>> d = MultiValueDict({'name': ['Adrian', 'Simon'], 'position': ['Developer']})