aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/reverse.py
diff options
context:
space:
mode:
authorTom Christie2012-02-23 08:58:10 +0000
committerTom Christie2012-02-23 08:58:10 +0000
commit2b59df004a5bb7449aa4c07277ac846c330a79f7 (patch)
tree3a5e20948d3cd0ea1ca4d25ff35d970646722a30 /djangorestframework/reverse.py
parent8e0b9e55ecb0733369918d4562ba38ba505cdfe8 (diff)
downloaddjango-rest-framework-2b59df004a5bb7449aa4c07277ac846c330a79f7.tar.bz2
reverse takes request as a kwarg for compatibility with django's reverse
Diffstat (limited to 'djangorestframework/reverse.py')
-rw-r--r--djangorestframework/reverse.py19
1 files changed, 8 insertions, 11 deletions
diff --git a/djangorestframework/reverse.py b/djangorestframework/reverse.py
index ad06f966..05643157 100644
--- a/djangorestframework/reverse.py
+++ b/djangorestframework/reverse.py
@@ -2,22 +2,19 @@
Provide reverse functions that return fully qualified URLs
"""
from django.core.urlresolvers import reverse as django_reverse
-from djangorestframework.compat import reverse_lazy as django_reverse_lazy
+from django.utils.functional import lazy
def reverse(viewname, request, *args, **kwargs):
"""
- Do the same as `django.core.urlresolvers.reverse` but using
- *request* to build a fully qualified URL.
+ Same as `django.core.urlresolvers.reverse`, but optionally takes a request
+ and returns a fully qualified URL, using the request to get the base URL.
"""
+ request = kwargs.pop('request', None)
url = django_reverse(viewname, *args, **kwargs)
- return request.build_absolute_uri(url)
+ if request:
+ return request.build_absolute_uri(url)
+ return url
-def reverse_lazy(viewname, request, *args, **kwargs):
- """
- Do the same as `django.core.urlresolvers.reverse_lazy` but using
- *request* to build a fully qualified URL.
- """
- url = django_reverse_lazy(viewname, *args, **kwargs)
- return request.build_absolute_uri(url)
+reverse_lazy = lazy(reverse, str)