reverse gets it's own module

5 files changed, 49 insertions, 30 deletions

diff --git a/djangorestframework/compat.py b/djangorestframework/compat.py
index 7690316c..b818b446 100644
--- a/djangorestframework/compat.py
+++ b/djangorestframework/compat.py
@@ -457,3 +457,11 @@ except ImportError: # python < 2.7
         return decorator
      
     unittest.skip = skip
+
+# reverse_lazy (Django 1.4 onwards)
+try:
+    from django.core.urlresolvers import reverse_lazy
+except:
+    from django.core.urlresolvers import reverse
+    from django.utils.functional import lazy
+    reverse_lazy = lazy(reverse, str)
diff --git a/djangorestframework/resources.py b/djangorestframework/resources.py
index 5e126def..2b84ee09 100644
--- a/djangorestframework/resources.py
+++ b/djangorestframework/resources.py
@@ -3,8 +3,9 @@ from django.core.urlresolvers import get_urlconf, get_resolver, NoReverseMatch
 from django.db import models
 
 from djangorestframework.response import ErrorResponse
+from djangorestframework.reverse import reverse
 from djangorestframework.serializer import Serializer, _SkipField
-from djangorestframework.utils import as_tuple, reverse
+from djangorestframework.utils import as_tuple
 
 
 class BaseResource(Serializer):
diff --git a/djangorestframework/reverse.py b/djangorestframework/reverse.py
new file mode 100644
index 00000000..ad06f966
--- /dev/null
+++ b/djangorestframework/reverse.py
@@ -0,0 +1,23 @@
+"""
+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
+
+
+def reverse(viewname, request, *args, **kwargs):
+    """
+    Do the same as `django.core.urlresolvers.reverse` but using
+    *request* to build a fully qualified URL.
+    """
+    url = django_reverse(viewname, *args, **kwargs)
+    return request.build_absolute_uri(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)
diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py
index 3ac04d8c..9c0aee79 100644
--- a/djangorestframework/tests/reverse.py
+++ b/djangorestframework/tests/reverse.py
@@ -2,27 +2,32 @@ from django.conf.urls.defaults import patterns, url
 from django.test import TestCase
 from django.utils import simplejson as json
 
-from djangorestframework.utils import reverse
+from djangorestframework.renderers import JSONRenderer
+from djangorestframework.reverse import reverse
 from djangorestframework.views import View
 
 
-class MockView(View):
-    """Mock resource which simply returns a URL, so that we can ensure that reversed URLs are fully qualified"""
-    permissions = ()
+class MyView(View):
+    """
+    Mock resource which simply returns a URL, so that we can ensure
+    that reversed URLs are fully qualified.
+    """
+    renderers = (JSONRenderer, )
 
     def get(self, request):
-        return reverse('another', request)
+        return reverse('myview', request)
 
 urlpatterns = patterns('',
-    url(r'^$', MockView.as_view()),
-    url(r'^another$', MockView.as_view(), name='another'),
+    url(r'^myview$', MyView.as_view(), name='myview'),
 )
 
 
 class ReverseTests(TestCase):
-    """Tests for """
+    """
+    Tests for fully qualifed URLs when using `reverse`.
+    """
     urls = 'djangorestframework.tests.reverse'
 
     def test_reversed_urls_are_fully_qualified(self):
-        response = self.client.get('/')
-        self.assertEqual(json.loads(response.content), 'http://testserver/another')
+        response = self.client.get('/myview')
+        self.assertEqual(json.loads(response.content), 'http://testserver/myview')
diff --git a/djangorestframework/utils/__init__.py b/djangorestframework/utils/__init__.py
index fc8bae92..537d4252 100644
--- a/djangorestframework/utils/__init__.py
+++ b/djangorestframework/utils/__init__.py
@@ -1,7 +1,7 @@
 import django
 from django.utils.encoding import smart_unicode
 from django.utils.xmlutils import SimplerXMLGenerator
-from django.core.urlresolvers import resolve, reverse as django_reverse
+from django.core.urlresolvers import resolve
 from django.conf import settings
 
 from djangorestframework.compat import StringIO
@@ -174,21 +174,3 @@ class XMLRenderer():
 
 def dict2xml(input):
     return XMLRenderer().dict2xml(input)
-
-
-def reverse(viewname, request, *args, **kwargs):
-    """
-    Do the same as :py:func:`django.core.urlresolvers.reverse` but using
-    *request* to build a fully qualified URL.
-    """
-    return request.build_absolute_uri(django_reverse(viewname, *args, **kwargs))
-
-if django.VERSION >= (1, 4):
-    from django.core.urlresolvers import reverse_lazy as django_reverse_lazy
-
-    def reverse_lazy(viewname, request, *args, **kwargs):
-        """
-        Do the same as :py:func:`django.core.urlresolvers.reverse_lazy` but using
-        *request* to build a fully qualified URL.
-        """
-        return request.build_absolute_uri(django_reverse_lazy(viewname, *args, **kwargs))