Ticket #2620: 2620.patch

django/utils/datastructures.py

@@ +1 @@
+class NoDefault(object):
+    pass
+
 class MergeDict(object):
     """
     A simple class for creating new "virtual" dictionaries that actualy look
@@ -14 +17 @@
                 pass
         raise KeyError
 
-    def get(self, key, default):
+    def get(self, key, default=NoDefault):
         try:
             return self[key]
         except KeyError:

new file tests/othertests/datastructures.py

@@ +1 @@
+from django.utils.datastructures import MergeDict
+
+dict1 = {'a': 1, 'b': 2}
+dict2 = {'a': 10, 'c': 20}
+
+dictm = MergeDict(dict1, dict2)
+assert dictm['a'] == 1
+assert dictm['b'] == 2
+assert dictm['c'] == 20
+assert dictm.get('b') == 2
+assert dictm.get('b', 7) == 2
+assert dictm.get('x', 7) == 7