summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-02-04 05:45:17 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-02-04 05:45:17 +0000
commit0a9b7519582bc358be10bb374bfbdfe237e09578 (patch)
tree53cd8b31532dab0bf97bda74589e34a1b615b9f3 /django/utils/encoding.py
parenta4343209db3473b09aecc707cea522455c8218cc (diff)
queryset-refactor: Merged changes from trunk up to [7085].
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/encoding.py')
-rw-r--r--django/utils/encoding.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 2ab0db7432..33bb37b0ea 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -98,5 +98,5 @@ def iri_to_uri(iri):
# section 3.1 of RFC 3987.
if iri is None:
return iri
- return urllib.quote(smart_str(iri), safe='/#%[]=:;$&()+,!?')
+ return urllib.quote(smart_str(iri), safe='/#%[]=:;$&()+,!?*')