Ticket #8278: 8278.querydict.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()])
+        d = dict([(f(k), [f(v) for v in values]) for k, values in other_dict.lists()])
         MultiValueDict.update(self, d)
 
     def pop(self, key, *args):

django/django/utils/datastructures.py

@@ -293 +293 @@
             else:
                 try:
                     for key, value in other_dict.items():
-                        self.setlistdefault(key, []).append(value)
+                        if isinstance(value, list):
+                            self.setlistdefault(key, []).extend(value)
+                        else:
+                            self.setlistdefault(key, []).append(value)
                 except TypeError:
                     raise ValueError, "MultiValueDict.update() takes either a MultiValueDict or dictionary"
         for key, value in kwargs.iteritems():

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')
+>>> y = QueryDict('a=3&a=4')
+>>> x._mutable = True
+>>> x.update(y)
+>>> x._mutable=False
+>>> x
+<QueryDict: {u'a': [u'1', u'2', u'3', u'4']}>
+
 """
 
 from django.http import QueryDict, HttpResponse