diff options
Diffstat (limited to 'django/http')
| -rw-r--r-- | django/http/__init__.py | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/django/http/__init__.py b/django/http/__init__.py index 42027f0beb..90c55c6319 100644 --- a/django/http/__init__.py +++ b/django/http/__init__.py @@ -3,7 +3,7 @@ import os import re import time from pprint import pformat -from urllib import urlencode +from urllib import urlencode, quote from urlparse import urljoin try: from cStringIO import StringIO @@ -363,11 +363,30 @@ class QueryDict(MultiValueDict): """Returns a mutable copy of this object.""" return self.__deepcopy__({}) - def urlencode(self): + def urlencode(self, safe=None): + """ + Returns an encoded string of all query string arguments. + + :arg safe: Used to specify characters which do not require quoting, for + example:: + + >>> q = QueryDict('', mutable=True) + >>> q['next'] = '/a&b/' + >>> q.urlencode() + 'next=%2Fa%26b%2F' + >>> q.urlencode(safe='/') + 'next=/a%26b/' + + """ output = [] + if safe: + encode = lambda k, v: '%s=%s' % ((quote(k, safe), quote(v, safe))) + else: + encode = lambda k, v: urlencode({k: v}) for k, list_ in self.lists(): k = smart_str(k, self.encoding) - output.extend([urlencode({k: smart_str(v, self.encoding)}) for v in list_]) + output.extend([encode(k, smart_str(v, self.encoding)) + for v in list_]) return '&'.join(output) class CompatCookie(SimpleCookie): |