Ticket #9089: urlencode-multivaluedict.diff

django/utils/http.py

@@ -3 +3 @@
 
 from django.utils.encoding import smart_str, force_unicode
 from django.utils.functional import allow_lazy
+from django.utils.datastructures import MultiValueDict
 
 def urlquote(url, safe='/'):
     """
@@ -31 +32 @@
     unicode strings. The parameters are first case to UTF-8 encoded strings and
     then encoded as per normal.
     """
-    if hasattr(query, 'items'):
+    if isinstance(query, MultiValueDict):
+        query = query.lists()
+    elif hasattr(query, 'items'):
         query = query.items()
     return urllib.urlencode(
         [(smart_str(k),

tests/regressiontests/utils/http.py

@@ +1 @@
+"""
+>>> from django.utils.http import urlencode
+
+>>> urlencode({ 'a': 1, 'b': 2, 'c': 3})
+'a=1&c=3&b=2'
+
+>>> from django.utils.datastructures import MultiValueDict
+>>> urlencode(MultiValueDict({'name': ['Adrian', 'Simon'], 'position': ['Developer']}), doseq=True)
+'position=Developer&name=Adrian&name=Simon'
+>>> urlencode(MultiValueDict({'test': [1, 2, 3]}), doseq=True)
+'test=1&test=2&test=3'
+"""

tests/regressiontests/utils/tests.py

@@ -9 +9 @@
 import timesince
 import datastructures
 import itercompat
+import http
 from decorators import DecoratorFromMiddlewareTests
 
 # We need this because "datastructures" uses sorted() and the tests are run in
@@ -23 +24 @@
     'timesince': timesince,
     'datastructures': datastructures,
     'itercompat': itercompat,
+    'http': http,
 }
 
 class TestUtilsHtml(TestCase):