diff options
| author | Carlton Gibson | 2014-11-18 16:42:39 +0100 |
|---|---|---|
| committer | Carlton Gibson | 2014-11-18 16:42:39 +0100 |
| commit | c50a42bddc66e28d624cd3caadd2d63502ac2e6e (patch) | |
| tree | bf03e2dcb23c2e4f372ff00cba4a810a96c24681 /rest_framework/reverse.py | |
| parent | ba52c0c62762b9976fffa72dde7ce922176e481d (diff) | |
| parent | 080bd3d24e1866df2acc3aae0ec0f97ebe3a8c36 (diff) | |
| download | django-rest-framework-c50a42bddc66e28d624cd3caadd2d63502ac2e6e.tar.bz2 | |
Merge branch 'master' of github.com:tomchristie/django-rest-framework
Diffstat (limited to 'rest_framework/reverse.py')
| -rw-r--r-- | rest_framework/reverse.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py index a51b07f5..a74e8aa2 100644 --- a/rest_framework/reverse.py +++ b/rest_framework/reverse.py @@ -3,6 +3,7 @@ Provide reverse functions that return fully qualified URLs """ from __future__ import unicode_literals from django.core.urlresolvers import reverse as django_reverse +from django.utils import six from django.utils.functional import lazy @@ -20,4 +21,4 @@ def reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra return url -reverse_lazy = lazy(reverse, str) +reverse_lazy = lazy(reverse, six.text_type) |
