Ticket #8278: 8278.querydict.2.diff

django/django/http/__init__.py

@@ -191 +191 @@
     def update(self, other_dict):
         self._assert_mutable()
         f = lambda s: str_to_unicode(s, self.encoding)
-        d = dict([(f(k), f(v)) for k, v in other_dict.items()])
-        MultiValueDict.update(self, d)
+        try:
+            for key, _list in other_dict.lists():
+                for value in _list:
+                    MultiValueDict.update(self, { f(key): f(value) })
+        except AttributeError:
+            d = dict([(f(k), f(v)) for k, v in other_dict.items()])
+            MultiValueDict.update(self, d)
 
     def pop(self, key, *args):
         self._assert_mutable()

django/tests/regressiontests/httpwrappers/tests.py

@@ -426 +426 @@
 Traceback (most recent call last):
 ...
 UnicodeEncodeError: ..., HTTP response headers must be in US-ASCII format
- 
+
+
+
+#############################################################  
+# Merging 2 QueryDict's with same keys and multiple values  #  
+#############################################################
+
+>>> x = QueryDict('a=1&a=2', mutable=True)
+>>> y = QueryDict('a=3&a=4')
+>>> x.update(y)
+>>> x
+<QueryDict: {u'a': [u'1', u'2', u'3', u'4']}>
+
 """
 
 from django.http import QueryDict, HttpResponse