summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2014-09-18 13:03:09 -0700
committerTim Graham <timograham@gmail.com>2014-10-07 13:06:39 -0400
commitc1ef234e310fb984ced37eac8c8b90f5b6155e5f (patch)
tree51da49ccbe48c2bb942f8b3c72161636895d426c /django
parentd1e87aebf70dd035c98a0b0f0162c0a2c398598c (diff)
Fixed #23522 -- Changed reverse() to return a Unicode string; not bytes
Diffstat (limited to 'django')
-rw-r--r--django/core/urlresolvers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
index eff7e078e4..62e3949df8 100644
--- a/django/core/urlresolvers.py
+++ b/django/core/urlresolvers.py
@@ -577,9 +577,9 @@ def reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None, current
if ns_pattern:
resolver = get_ns_resolver(ns_pattern, resolver)
- return iri_to_uri(resolver._reverse_with_prefix(view, prefix, *args, **kwargs))
+ return force_text(iri_to_uri(resolver._reverse_with_prefix(view, prefix, *args, **kwargs)))
-reverse_lazy = lazy(reverse, str)
+reverse_lazy = lazy(reverse, six.text_type)
def clear_url_caches():