Ticket #5964: 5964.diff

django/utils/http.py

@@ -31 +31 @@
     without double-quoting occurring.
     """
     return force_unicode(urllib.quote(smart_str(url), smart_str(safe)))
-
 urlquote = allow_lazy(urlquote, unicode)
 
 def urlquote_plus(url, safe=''):
@@ -44 +43 @@
     return force_unicode(urllib.quote_plus(smart_str(url), smart_str(safe)))
 urlquote_plus = allow_lazy(urlquote_plus, unicode)
 
+def urlunquote(quoted_url):
+    """
+    A wrapper for Python's urllib.unquote() function that can operate on
+    the result of django.utils.http.urlquote().
+    """
+    return unicode(urllib.unquote(str(quoted_url)), 'utf-8')
+urlunquote = allow_lazy(urlunquote, unicode)
+
+def urlunquote_plus(quoted_url):
+    """
+    A wrapper for Python's urllib.unquote_plus() function that can operate on
+    the result of django.utils.http.urlquote_plus().
+    """
+    return unicode(urllib.unquote_plus(str(quoted_url)), 'utf-8')
+urlunquote_plus = allow_lazy(urlunquote_plus, unicode)
+
 def urlencode(query, doseq=0):
     """
     A version of Python's urllib.urlencode() function that can operate on

tests/regressiontests/text/tests.py

@@ -3 +3 @@
 
 from django.test import TestCase
 from django.utils.encoding import iri_to_uri
-from django.utils.http import urlquote, urlquote_plus, cookie_date, http_date
+from django.utils.http import (
+    urlquote, urlquote_plus, urlunquote, urlunquote_plus, cookie_date,
+    http_date)
 from django.utils.text import get_text_list, smart_split
 from django.utils.translation import override
 
@@ -60 +62 @@
             [u"cut:','|cut:' '"])
 
     def test_urlquote(self):
-
         self.assertEqual(urlquote(u'Paris & Orl\xe9ans'),
             u'Paris%20%26%20Orl%C3%A9ans')
         self.assertEqual(urlquote(u'Paris & Orl\xe9ans', safe="&"),
             u'Paris%20&%20Orl%C3%A9ans')
+        self.assertEqual(
+            urlunquote(u'Paris%20%26%20Orl%C3%A9ans'),
+            u'Paris & Orl\xe9ans')
+        self.assertEqual(
+            urlunquote(u'Paris%20&%20Orl%C3%A9ans'),
+            u'Paris & Orl\xe9ans')
         self.assertEqual(urlquote_plus(u'Paris & Orl\xe9ans'),
             u'Paris+%26+Orl%C3%A9ans')
         self.assertEqual(urlquote_plus(u'Paris & Orl\xe9ans', safe="&"),
             u'Paris+&+Orl%C3%A9ans')
+        self.assertEqual(
+            urlunquote_plus(u'Paris+%26+Orl%C3%A9ans'),
+            u'Paris & Orl\xe9ans')
+        self.assertEqual(
+            urlunquote_plus(u'Paris+&+Orl%C3%A9ans'),
+            u'Paris & Orl\xe9ans')
+
 
     def test_cookie_date(self):
         t = 1167616461.0