summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-24 06:24:30 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-24 06:24:30 +0000
commit31d5d550901d2fe30679bb2ef6302af2c3df1372 (patch)
tree365f77d215dea8ffb4b317f823ef5a56bafb2850
parentfbce6f6bdc9b2c2f71bf4324d9b3c0b92aee12cb (diff)
unicode: Added call to iri_to_uri() on the result of a reverse() call. This
makes using the permalink() decorator more natural. git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/urlresolvers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
index 38b3263da1..43cd11f967 100644
--- a/django/core/urlresolvers.py
+++ b/django/core/urlresolvers.py
@@ -9,6 +9,7 @@ a string) and returns a tuple in this format:
from django.http import Http404
from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
+from django.utils.encoding import iri_to_uri
import re
class Resolver404(Http404):
@@ -248,4 +249,4 @@ def reverse(viewname, urlconf=None, args=None, kwargs=None):
from django.conf import settings
urlconf = settings.ROOT_URLCONF
resolver = RegexURLResolver(r'^/', urlconf)
- return '/' + resolver.reverse(viewname, *args, **kwargs)
+ return iri_to_uri(u'/' + resolver.reverse(viewname, *args, **kwargs))