Ticket #12820: 0001-Ticket-12820-fix-iteration-over-MergeDict.patch

django/utils/datastructures.py

@@ -39 +39 @@
 
     def items(self):
         item_list = []
+        seen = set()
         for dict_ in self.dicts:
-            item_list.extend(dict_.items())
+            for item in dict_.items():
+                if item[0] in seen:
+                    continue
+                item_list.append(item)
+                seen.add(item[0])
         return item_list
 
+    def keys(self):
+        return [item[0] for item in self.items()]
+
+    def values(self):
+        return [item[1] for item in self.items()]
+
+    def __iter__(self):
+        return iter(self.keys())
+
     def has_key(self, key):
         for dict_ in self.dicts:
             if key in dict_:

tests/regressiontests/datastructures/tests.py

@@ -34 +34 @@
 >>> mm.getlist('undefined')
 []
 
+>>> sorted(mm.keys())
+['key1', 'key2', 'key4']
+>>> len(mm.values())
+3
+>>> "value1" in mm.values()
+True
+>>> sorted(mm.items(), key=lambda k: k[0])
+[('key1', 'value1'), ('key2', 'value3'), ('key4', 'value6')]
+>>> [(k,mm.getlist(k)) for k in sorted(mm)]
+[('key1', ['value1']), ('key2', ['value2', 'value3']), ('key4', ['value5', 'value6'])]
+
 ### MultiValueDict ##########################################################
 
 >>> d = MultiValueDict({'name': ['Adrian', 'Simon'], 'position': ['Developer']})