Skip to content
Browse files

Fixed #8278: fixed `QueryDict.update(QueryDict)`. Thanks, julien.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8705 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent cd0b65b commit 6a8dcafb575c3b0147223c04e7ccae553c0c9a49 @jacobian jacobian committed
Showing with 15 additions and 2 deletions.
  1. +7 −2 django/http/__init__.py
  2. +8 −0 tests/regressiontests/httpwrappers/tests.py
View
9 django/http/__init__.py
@@ -211,8 +211,13 @@ def appendlist(self, key, value):
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)
+ if hasattr(other_dict, 'lists'):
+ for key, valuelist in other_dict.lists():
+ for value in valuelist:
+ MultiValueDict.update(self, {f(key): f(value)})
+ else:
+ 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()
View
8 tests/regressiontests/httpwrappers/tests.py
@@ -436,6 +436,14 @@
...
UnicodeEncodeError: ..., HTTP response headers must be in US-ASCII format
+#
+# Regression test for #8278: QueryDict.update(QueryDict)
+#
+>>> x = QueryDict("a=1&a=2", mutable=True)
+>>> y = QueryDict("a=3&a=4")
+>>> x.update(y)
+>>> x.getlist('a')
+[u'1', u'2', u'3', u'4']
"""
from django.http import QueryDict, HttpResponse

0 comments on commit 6a8dcaf

Please sign in to comment.
Something went wrong with that request. Please try again.