Ticket #5611: parsesql.diff

django/http/__init__.py

@@ -9 +9 @@
     from mod_python.util import parse_qsl
 except ImportError:
     from cgi import parse_qsl
+# whilst being efficient, the mod_python version also breaks on certain data, so we need this for those cases
+from cgi import parse_qsl as parse_qsl_cgi
 
 from django.utils.datastructures import MultiValueDict, ImmutableList
 from django.utils.encoding import smart_str, iri_to_uri, force_unicode
@@ -144 +146 @@
             from django.conf import settings
             encoding = settings.DEFAULT_CHARSET
         self.encoding = encoding
-        for key, value in parse_qsl((query_string or ''), True): # keep_blank_values=True
-            self.appendlist(force_unicode(key, encoding, errors='replace'),
-                            force_unicode(value, encoding, errors='replace'))
+        def do_parse(parse_qsl_method):
+            for key, value in parse_qsl_method((query_string or ''), True): # keep_blank_values=True
+                self.appendlist(force_unicode(key, encoding, errors='replace'),
+                                force_unicode(value, encoding, errors='replace'))
+        try:
+            do_parse(parse_qsl)
+        except TypeError:
+            do_parse(parse_qsl_cgi)
         self._mutable = mutable
 
     def _get_encoding(self):