Ticket #5734: utils_http_urlquote_safe.diff

django/utils/http.py

@@ -9 +9 @@
     can safely be used as part of an argument to a subsequent iri_to_uri() call
     without double-quoting occurring.
     """
-    return force_unicode(urllib.quote(smart_str(url)))
+    return force_unicode(urllib.quote(smart_str(url), safe))
+
 urlquote = allow_lazy(urlquote, unicode)
 
 def urlquote_plus(url, safe=''):

tests/regressiontests/text/tests.py

@@ -20 +20 @@
 >>> from django.utils.http import urlquote, urlquote_plus
 >>> urlquote(u'Paris & Orl\xe9ans')
 u'Paris%20%26%20Orl%C3%A9ans'
+>>> urlquote(u'Paris & Orl\xe9ans', safe="&")
+u'Paris%20&%20Orl%C3%A9ans'
 >>> urlquote_plus(u'Paris & Orl\xe9ans')
 u'Paris+%26+Orl%C3%A9ans'
+>>> urlquote_plus(u'Paris & Orl\xe9ans', safe="&")
+u'Paris+&+Orl%C3%A9ans'
 
 ### iri_to_uri ###########################################################
 >>> from django.utils.encoding import iri_to_uri