Changeset 7062

Timestamp:

02/02/08 20:02:41 (5 months ago)

Author:

mtredinnick

Message:

Fixed #6465 -- Tweaked MergeDict?.getlist() to work with Django's MultiValueDict? class. Thanks, Matt McClanahan?.

Files:

• django/trunk/django/utils/datastructures.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/datastructures/tests.py (modified) (1 diff)

django/trunk/django/utils/datastructures.py

@@ -3 +3 @@
-    A simple class for creating new "virtual" dictionaries that actually look
-    up values in more than one dictionary, passed in the constructor.
+
+    If a key appears in more than one of the passed in dictionaries, only the
+    first occurrence will be used.
-    """
-    def __init__(self, *dicts):
@@ -26 +29 @@
-    def getlist(self, key):
-        for dict_ in self.dicts:
-try
+if key in dict_.keys()
-                return dict_.getlist(key)
-
-
-
+
-
-    def items(self):

django/trunk/tests/regressiontests/datastructures/tests.py

@@ -20 +20 @@
->>> md2['chris']
-'cool'
+
+MergeDict can merge MultiValueDicts
+>>> multi1 = MultiValueDict({'key1': ['value1'], 'key2': ['value2', 'value3']})
+>>> multi2 = MultiValueDict({'key2': ['value4'], 'key4': ['value5', 'value6']})
+>>> mm = MergeDict(multi1, multi2)
+
+# Although 'key2' appears in both dictionaries, only the first value is used.
+>>> mm.getlist('key2')
+['value2', 'value3']
+>>> mm.getlist('key4')
+['value5', 'value6']
+>>> mm.getlist('undefined')
+[]
-
-### MultiValueDict ##########################################################