From 77d061d234e03004f34058028707ecddfc730fae Mon Sep 17 00:00:00 2001
From: Brandon Cazander
Date: Wed, 28 Jan 2015 17:08:34 -0800
Subject: Provide rest_framework.resolve. Fixes #2489

---
 rest_framework/relations.py  |  7 ++++---
 rest_framework/reverse.py    | 15 ++++++++++++-
 rest_framework/versioning.py | 16 ++++++++++++++
 tests/test_relations.py      | 50 ++++++++++++++++++++++++++++++++++++++++++--
 tests/urls.py                |  4 ++--
 5 files changed, 84 insertions(+), 8 deletions(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 66857a41..809d3db9 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 from __future__ import unicode_literals
 from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
-from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch, Resolver404
+from django.core.urlresolvers import get_script_prefix, NoReverseMatch, Resolver404
 from django.db.models.query import QuerySet
 from django.utils import six
 from django.utils.encoding import smart_text
@@ -9,7 +9,7 @@ from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 from rest_framework.compat import OrderedDict
 from rest_framework.fields import get_attribute, empty, Field
-from rest_framework.reverse import reverse
+from rest_framework.reverse import reverse, resolve
 from rest_framework.utils import html
 
 
@@ -205,6 +205,7 @@ class HyperlinkedRelatedField(RelatedField):
         return self.reverse(view_name, kwargs=kwargs, request=request, format=format)
 
     def to_internal_value(self, data):
+        request = self.context.get('request', None)
         try:
             http_prefix = data.startswith(('http:', 'https:'))
         except AttributeError:
@@ -218,7 +219,7 @@ class HyperlinkedRelatedField(RelatedField):
                 data = '/' + data[len(prefix):]
 
         try:
-            match = self.resolve(data)
+            match = self.resolve(data, request=request)
         except Resolver404:
             self.fail('no_match')
 
diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py
index 8fcca55b..0d1d94a7 100644
--- a/rest_framework/reverse.py
+++ b/rest_framework/reverse.py
@@ -1,12 +1,25 @@
 """
-Provide reverse functions that return fully qualified URLs
+Provide urlresolver functions that return fully qualified URLs or view names
 """
 from __future__ import unicode_literals
 from django.core.urlresolvers import reverse as django_reverse
+from django.core.urlresolvers import resolve as django_resolve
 from django.utils import six
 from django.utils.functional import lazy
 
 
+def resolve(path, urlconf=None, request=None):
+    """
+    If versioning is being used then we pass any `resolve` calls through
+    to the versioning scheme instance, so that the resulting view name
+    can be modified if needed.
+    """
+    scheme = getattr(request, 'versioning_scheme', None)
+    if scheme is not None:
+        return scheme.resolve(path, urlconf, request)
+    return django_resolve(path, urlconf)
+
+
 def reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra):
     """
     If versioning is being used then we pass any `reverse` calls through
diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py
index a07b629f..a76da17a 100644
--- a/rest_framework/versioning.py
+++ b/rest_framework/versioning.py
@@ -1,6 +1,8 @@
 # coding: utf-8
 from __future__ import unicode_literals
 from django.utils.translation import ugettext_lazy as _
+from django.core.urlresolvers import resolve as django_resolve
+from django.core.urlresolvers import ResolverMatch
 from rest_framework import exceptions
 from rest_framework.compat import unicode_http_header
 from rest_framework.reverse import _reverse
@@ -24,6 +26,9 @@ class BaseVersioning(object):
     def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra):
         return _reverse(viewname, args, kwargs, request, format, **extra)
 
+    def resolve(self, path, urlconf=None):
+        return django_resolve(path, urlconf)
+
     def is_allowed_version(self, version):
         if not self.allowed_versions:
             return True
@@ -127,6 +132,17 @@ class NamespaceVersioning(BaseVersioning):
             viewname, args, kwargs, request, format, **extra
         )
 
+    def resolve(self, path, urlconf=None, request=None):
+        match = django_resolve(path, urlconf)
+        if match.namespace:
+            _, view_name = match.view_name.split(':')
+            return ResolverMatch(func=match.func,
+                                 args=match.args,
+                                 kwargs=match.kwargs,
+                                 url_name=view_name,
+                                 app_name=match.app_name)
+        return match
+
 
 class HostNameVersioning(BaseVersioning):
     """
diff --git a/tests/test_relations.py b/tests/test_relations.py
index fbe176e2..b82a1f2a 100644
--- a/tests/test_relations.py
+++ b/tests/test_relations.py
@@ -1,11 +1,28 @@
 from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset
-from django.core.exceptions import ImproperlyConfigured
+from django.conf.urls import patterns, url, include
+from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
 from django.utils.datastructures import MultiValueDict
 from rest_framework import serializers
 from rest_framework.fields import empty
-from rest_framework.test import APISimpleTestCase
+from rest_framework.test import APISimpleTestCase, APIRequestFactory
+from rest_framework.versioning import NamespaceVersioning
 import pytest
 
+factory = APIRequestFactory()
+request = factory.get('/')  # Just to ensure we have a request in the serializer context
+
+dummy_view = lambda request, pk: None
+
+included_patterns = [
+    url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail')
+]
+
+urlpatterns = patterns(
+    '',
+    url(r'^v1/', include(included_patterns, namespace='v1')),
+    url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail')
+)
+
 
 class TestStringRelatedField(APISimpleTestCase):
     def setUp(self):
@@ -48,6 +65,35 @@ class TestPrimaryKeyRelatedField(APISimpleTestCase):
         assert representation == self.instance.pk
 
 
+class TestHyperlinkedRelatedField(APISimpleTestCase):
+    urls = 'tests.test_relations'
+
+    def setUp(self):
+        class HyperlinkedMockQueryset(MockQueryset):
+            def get(self, **lookup):
+                for item in self.items:
+                    if item.pk == int(lookup.get('pk', -1)):
+                        return item
+                raise ObjectDoesNotExist()
+
+        self.queryset = HyperlinkedMockQueryset([
+            MockObject(pk=1, name='foo'),
+            MockObject(pk=2, name='bar'),
+            MockObject(pk=3, name='baz')
+        ])
+        self.field = serializers.HyperlinkedRelatedField(
+            view_name='example-detail',
+            queryset=self.queryset
+        )
+        request = factory.post('/')
+        request.versioning_scheme = NamespaceVersioning()
+        self.field._context = {'request': request}
+
+    def test_bug_2489(self):
+        self.field.to_internal_value('/example/3/')
+        self.field.to_internal_value('/v1/example/3/')
+
+
 class TestHyperlinkedIdentityField(APISimpleTestCase):
     def setUp(self):
         self.instance = MockObject(pk=1, name='foo')
diff --git a/tests/urls.py b/tests/urls.py
index 41f527df..742e361d 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,6 +1,6 @@
 """
 Blank URLConf just to keep the test suite happy
 """
-from django.conf.urls import patterns
+from tests import test_relations
 
-urlpatterns = patterns('')
+urlpatterns = test_relations.urlpatterns
-- 
cgit v1.2.3


From f3067a7fabdd0edb5bc5f48cfdadd2850866c189 Mon Sep 17 00:00:00 2001
From: Brandon Cazander
Date: Mon, 2 Feb 2015 20:41:06 -0800
Subject: Remove unnecessary APIRequestFactory get from tests.

---
 tests/test_relations.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/test_relations.py b/tests/test_relations.py
index b82a1f2a..ff377d38 100644
--- a/tests/test_relations.py
+++ b/tests/test_relations.py
@@ -9,7 +9,6 @@ from rest_framework.versioning import NamespaceVersioning
 import pytest
 
 factory = APIRequestFactory()
-request = factory.get('/')  # Just to ensure we have a request in the serializer context
 
 dummy_view = lambda request, pk: None
 
-- 
cgit v1.2.3


From d015534d530dfdc2bbd7e301ec79fed533d55032 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 3 Feb 2015 09:15:42 +0000
Subject: Fleshing out 3.1 announcement

---
 docs/topics/3.1-announcement.md | 69 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md
index 5f4a8d45..73cccb1c 100644
--- a/docs/topics/3.1-announcement.md
+++ b/docs/topics/3.1-announcement.md
@@ -1,17 +1,82 @@
 # Django REST framework 3.1
 
+The 3.1 release is an intermediate step in the Kickstarter project releases, and includes a range of new functionality.
+
 ## Pagination
 
+The pagination API has been improved, making it both easier to use, and more powerful.
+
+#### New pagination schemes.
+
+Until now, there has only been a single built-in pagination style in REST framework. We now have page, limit/offset and cursor based schemes included by default.
+
+The cursor based pagination scheme is particularly smart, and is a better approach for clients iterating through large or frequently changing result sets. The scheme supports paging against non-unique indexes, by using both cursor and limit/offset information. Credit to David Cramer for [this blog post](http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/) on the subject.
+
 #### Pagination controls in the browsable API.
 
-#### New schemes, including cursor pagination.
+Paginated results now include controls that render directly in the browsable API. If you're using the page or limit/offset style, then you'll see a page based control displayed in the browsable API.
+
+**IMAGE**
+
+The cursor based pagination renders a more simple 'Previous'/'Next' control.
+
+**IMAGE**
 
 #### Support for header-based pagination.
 
+The pagination API was previously only able to alter the pagination style in the body of the response. The API now supports being able to write pagination information in response headers, making it possible to use pagination schemes that use the `Link` or `Content-Range` headers.
+
+**TODO**: Link to docs.
+
 ## Versioning
 
+We've made it easier to build versioned APIs. Built-in schemes for versioning include both URL based and Accept header based variations.
+
+When using a URL based scheme, hyperlinked serializers will resolve relationships to the same API version as used on the incoming request.
+
+**TODO**: Example.
+
 ## Internationalization
 
-## New fields
+REST framework now includes a built-in set of translations, and supports internationalized error responses. This allows you to either change the default language, or to allow clients to specify the language via the `Accept-Language` header.
+
+**TODO**: Example.
+
+**TODO**: Credit.
+
+## New field types
+
+Django 1.8's new `ArrayField`, `HStoreField` and `UUIDField` are now all fully supported.
+
+This work also means that we now have both `serializers.DictField()`, and `serializers.ListField()` types, allowing you to express and validate a wider set of representations.
 
 ## ModelSerializer API
+
+The serializer redesign in 3.0 did not include any public API for modifying how ModelSerializer classes automatically generate a set of fields from a given mode class. We've now re-introduced an API for this, allowing you to create new ModelSerializer base classes that behave differently, such as using a different default style for relationships.
+
+**TODO**: Link to docs.
+
+## Moving packages out of core
+
+We've now moved a number of packages out of the core of REST framework, and into separately installable packages. If you're currently using these you don't need to worry, you simply need to `pip install` the new packages, and change any import paths.
+
+We're making this change in order to distribute the maintainance workload, and keep better focus of the core essentials of the framework.
+
+The change also means we can be more flexible with which external packages we recommend. For example, the excellently maintained [Django OAuth toolkit](https://github.com/evonove/django-oauth-toolkit) is now our recommended option for integrating OAuth support.
+
+**TODO** Links and package names
+
+* XML
+* YAML
+* JSONP
+* OAuth
+
+# What's next?
+
+The next focus will be on HTML renderings of API output and will include:
+
+* HTML form rendering of serializers.
+* Filtering controls built-in to the browsable API.
+* An alternative admin-style interface.
+
+This will either be made as a single 3.2 release, or split across two separate releases, with the HTML forms and filter controls coming in 3.2, and the admin-style interface coming in a 3.3 release.
\ No newline at end of file
-- 
cgit v1.2.3


From 030f01afdbcd4018a288250ef1f4c12de28e63bb Mon Sep 17 00:00:00 2001
From: Brandon Cazander
Date: Tue, 3 Feb 2015 02:14:38 -0800
Subject: Reorganize tests.

---
 tests/test_relations.py  | 49 ++----------------------------------------------
 tests/test_versioning.py | 41 ++++++++++++++++++++++++++++++++++++++--
 tests/urls.py            |  4 ++--
 3 files changed, 43 insertions(+), 51 deletions(-)

diff --git a/tests/test_relations.py b/tests/test_relations.py
index ff377d38..fbe176e2 100644
--- a/tests/test_relations.py
+++ b/tests/test_relations.py
@@ -1,27 +1,11 @@
 from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset
-from django.conf.urls import patterns, url, include
-from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
+from django.core.exceptions import ImproperlyConfigured
 from django.utils.datastructures import MultiValueDict
 from rest_framework import serializers
 from rest_framework.fields import empty
-from rest_framework.test import APISimpleTestCase, APIRequestFactory
-from rest_framework.versioning import NamespaceVersioning
+from rest_framework.test import APISimpleTestCase
 import pytest
 
-factory = APIRequestFactory()
-
-dummy_view = lambda request, pk: None
-
-included_patterns = [
-    url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail')
-]
-
-urlpatterns = patterns(
-    '',
-    url(r'^v1/', include(included_patterns, namespace='v1')),
-    url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail')
-)
-
 
 class TestStringRelatedField(APISimpleTestCase):
     def setUp(self):
@@ -64,35 +48,6 @@ class TestPrimaryKeyRelatedField(APISimpleTestCase):
         assert representation == self.instance.pk
 
 
-class TestHyperlinkedRelatedField(APISimpleTestCase):
-    urls = 'tests.test_relations'
-
-    def setUp(self):
-        class HyperlinkedMockQueryset(MockQueryset):
-            def get(self, **lookup):
-                for item in self.items:
-                    if item.pk == int(lookup.get('pk', -1)):
-                        return item
-                raise ObjectDoesNotExist()
-
-        self.queryset = HyperlinkedMockQueryset([
-            MockObject(pk=1, name='foo'),
-            MockObject(pk=2, name='bar'),
-            MockObject(pk=3, name='baz')
-        ])
-        self.field = serializers.HyperlinkedRelatedField(
-            view_name='example-detail',
-            queryset=self.queryset
-        )
-        request = factory.post('/')
-        request.versioning_scheme = NamespaceVersioning()
-        self.field._context = {'request': request}
-
-    def test_bug_2489(self):
-        self.field.to_internal_value('/example/3/')
-        self.field.to_internal_value('/v1/example/3/')
-
-
 class TestHyperlinkedIdentityField(APISimpleTestCase):
     def setUp(self):
         self.instance = MockObject(pk=1, name='foo')
diff --git a/tests/test_versioning.py b/tests/test_versioning.py
index c44f727d..e7c8485e 100644
--- a/tests/test_versioning.py
+++ b/tests/test_versioning.py
@@ -1,9 +1,13 @@
+from .utils import MockObject, MockQueryset
 from django.conf.urls import include, url
+from django.core.exceptions import ObjectDoesNotExist
+from rest_framework import serializers
 from rest_framework import status, versioning
 from rest_framework.decorators import APIView
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
-from rest_framework.test import APIRequestFactory, APITestCase
+from rest_framework.test import APIRequestFactory, APITestCase, APISimpleTestCase
+from rest_framework.versioning import NamespaceVersioning
 
 
 class RequestVersionView(APIView):
@@ -29,15 +33,18 @@ class RequestInvalidVersionView(APIView):
 factory = APIRequestFactory()
 
 mock_view = lambda request: None
+dummy_view = lambda request, pk: None
 
 included_patterns = [
     url(r'^namespaced/$', mock_view, name='another'),
+    url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail')
 ]
 
 urlpatterns = [
     url(r'^v1/', include(included_patterns, namespace='v1')),
     url(r'^another/$', mock_view, name='another'),
-    url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another')
+    url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another'),
+    url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail')
 ]
 
 
@@ -221,3 +228,33 @@ class TestInvalidVersion:
         request.resolver_match = FakeResolverMatch
         response = view(request, version='v3')
         assert response.status_code == status.HTTP_404_NOT_FOUND
+
+
+class TestHyperlinkedRelatedField(APISimpleTestCase):
+    urls = 'tests.test_versioning'
+
+    def setUp(self):
+
+        class HyperlinkedMockQueryset(MockQueryset):
+            def get(self, **lookup):
+                for item in self.items:
+                    if item.pk == int(lookup.get('pk', -1)):
+                        return item
+                raise ObjectDoesNotExist()
+
+        self.queryset = HyperlinkedMockQueryset([
+            MockObject(pk=1, name='foo'),
+            MockObject(pk=2, name='bar'),
+            MockObject(pk=3, name='baz')
+        ])
+        self.field = serializers.HyperlinkedRelatedField(
+            view_name='example-detail',
+            queryset=self.queryset
+        )
+        request = factory.post('/', urlconf='tests.test_versioning')
+        request.versioning_scheme = NamespaceVersioning()
+        self.field._context = {'request': request}
+
+    def test_bug_2489(self):
+        self.field.to_internal_value('/example/3/')
+        self.field.to_internal_value('/v1/example/3/')
diff --git a/tests/urls.py b/tests/urls.py
index 742e361d..41f527df 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,6 +1,6 @@
 """
 Blank URLConf just to keep the test suite happy
 """
-from tests import test_relations
+from django.conf.urls import patterns
 
-urlpatterns = test_relations.urlpatterns
+urlpatterns = patterns('')
-- 
cgit v1.2.3


From 8b4ce5c636a9abb33029e48f969bbdf38f97ca1f Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 4 Feb 2015 09:07:10 +0000
Subject: Minor authentication message improvement.

---
 env/pip-selfcheck.json           | 1 +
 rest_framework/authentication.py | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 env/pip-selfcheck.json

diff --git a/env/pip-selfcheck.json b/env/pip-selfcheck.json
new file mode 100644
index 00000000..ad56313b
--- /dev/null
+++ b/env/pip-selfcheck.json
@@ -0,0 +1 @@
+{"last_check":"2015-02-04T09:06:02Z","pypi_version":"6.0.7"}
\ No newline at end of file
diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py
index 11db0585..a75cd30c 100644
--- a/rest_framework/authentication.py
+++ b/rest_framework/authentication.py
@@ -86,8 +86,13 @@ class BasicAuthentication(BaseAuthentication):
         Authenticate the userid and password against username and password.
         """
         user = authenticate(username=userid, password=password)
-        if user is None or not user.is_active:
+
+        if user is None:
             raise exceptions.AuthenticationFailed(_('Invalid username/password.'))
+
+        if not user.is_active:
+            raise exceptions.AuthenticationFailed(_('User inactive or deleted.'))
+
         return (user, None)
 
     def authenticate_header(self, request):
-- 
cgit v1.2.3


From a0374e44985172e4b8f6dc91fbc22897d2b06767 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 4 Feb 2015 09:08:43 +0000
Subject: Remove erronous checkin

---
 env/pip-selfcheck.json | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 env/pip-selfcheck.json

diff --git a/env/pip-selfcheck.json b/env/pip-selfcheck.json
deleted file mode 100644
index ad56313b..00000000
--- a/env/pip-selfcheck.json
+++ /dev/null
@@ -1 +0,0 @@
-{"last_check":"2015-02-04T09:06:02Z","pypi_version":"6.0.7"}
\ No newline at end of file
-- 
cgit v1.2.3


From 41b213414df57d7e39f1bbf3aaa35a1b033e89a3 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 4 Feb 2015 23:32:25 +0000
Subject: Updating release notes

---
 docs/topics/3.1-announcement.md | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md
index 73cccb1c..d5986360 100644
--- a/docs/topics/3.1-announcement.md
+++ b/docs/topics/3.1-announcement.md
@@ -60,16 +60,30 @@ The serializer redesign in 3.0 did not include any public API for modifying how
 
 We've now moved a number of packages out of the core of REST framework, and into separately installable packages. If you're currently using these you don't need to worry, you simply need to `pip install` the new packages, and change any import paths.
 
-We're making this change in order to distribute the maintainance workload, and keep better focus of the core essentials of the framework.
+We're making this change in order to help distribute the maintainance workload, and keep better focus of the core essentials of the framework.
 
-The change also means we can be more flexible with which external packages we recommend. For example, the excellently maintained [Django OAuth toolkit](https://github.com/evonove/django-oauth-toolkit) is now our recommended option for integrating OAuth support.
+The change also means we can be more flexible with which external packages we recommend. For example, the excellently maintained [Django OAuth toolkit](https://github.com/evonove/django-oauth-toolkit) has now been promoted as our recommended option for integrating OAuth support.
 
-**TODO** Links and package names
+The following packages are now moved out of core and should be separately installed:
 
-* XML
-* YAML
-* JSONP
-* OAuth
+* OAuth - [djangorestframework-oauth](http://jpadilla.github.io/django-rest-framework-oauth/)
+* XML - [djangorestframework-xml](http://jpadilla.github.io/django-rest-framework-xml)
+* YAML - [djangorestframework-yaml](http://jpadilla.github.io/django-rest-framework-yaml)
+* JSONP - [djangorestframework-jsonp](http://jpadilla.github.io/django-rest-framework-jsonp)
+
+It's worth reiterating that this change in policy shouldn't mean any work in your codebase other than adding a new requirement and modifying some import paths. For example to install XML rendering, you would now do:
+
+    pip install djangorestframework-xml
+
+And modify your settings, like so:
+
+    REST_FRAMEWORK = {
+        'DEFAULT_RENDERER_CLASSES': [
+            'rest_framework.renderers.JSONRenderer',
+            'rest_framework.renderers.BrowsableAPIRenderer',
+            'rest_framework_xml.renderers.XMLRenderer'
+        ]
+    }
 
 # What's next?
 
-- 
cgit v1.2.3


From e1c45133126e0c47b8470b4cf7a43c6a7f4fca43 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 5 Feb 2015 00:58:09 +0000
Subject: Fix NamespaceVersioning with hyperlinked serializer fields

---
 rest_framework/relations.py       | 20 ++++++++++------
 rest_framework/reverse.py         | 13 ----------
 rest_framework/versioning.py      | 19 +++------------
 tests/test_relations_hyperlink.py |  7 +++---
 tests/test_versioning.py          | 50 +++++++++++++++++++++++----------------
 tests/utils.py                    | 24 +++++++++++++++++++
 6 files changed, 72 insertions(+), 61 deletions(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 809d3db9..0b7c9d86 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 from __future__ import unicode_literals
 from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
-from django.core.urlresolvers import get_script_prefix, NoReverseMatch, Resolver404
+from django.core.urlresolvers import get_script_prefix, resolve, NoReverseMatch, Resolver404
 from django.db.models.query import QuerySet
 from django.utils import six
 from django.utils.encoding import smart_text
@@ -9,7 +9,7 @@ from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 from rest_framework.compat import OrderedDict
 from rest_framework.fields import get_attribute, empty, Field
-from rest_framework.reverse import reverse, resolve
+from rest_framework.reverse import reverse
 from rest_framework.utils import html
 
 
@@ -167,11 +167,10 @@ class HyperlinkedRelatedField(RelatedField):
         self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field)
         self.format = kwargs.pop('format', None)
 
-        # We include these simply for dependency injection in tests.
-        # We can't add them as class attributes or they would expect an
+        # We include this simply for dependency injection in tests.
+        # We can't add it as a class attributes or it would expect an
         # implicit `self` argument to be passed.
         self.reverse = reverse
-        self.resolve = resolve
 
         super(HyperlinkedRelatedField, self).__init__(**kwargs)
 
@@ -219,11 +218,18 @@ class HyperlinkedRelatedField(RelatedField):
                 data = '/' + data[len(prefix):]
 
         try:
-            match = self.resolve(data, request=request)
+            match = resolve(data)
         except Resolver404:
             self.fail('no_match')
 
-        if match.view_name != self.view_name:
+        try:
+            expected_viewname = request.versioning_scheme.get_versioned_viewname(
+                self.view_name, request
+            )
+        except AttributeError:
+            expected_viewname = self.view_name
+
+        if match.view_name != expected_viewname:
             self.fail('incorrect_match')
 
         try:
diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py
index 0d1d94a7..a251d99d 100644
--- a/rest_framework/reverse.py
+++ b/rest_framework/reverse.py
@@ -3,23 +3,10 @@ Provide urlresolver functions that return fully qualified URLs or view names
 """
 from __future__ import unicode_literals
 from django.core.urlresolvers import reverse as django_reverse
-from django.core.urlresolvers import resolve as django_resolve
 from django.utils import six
 from django.utils.functional import lazy
 
 
-def resolve(path, urlconf=None, request=None):
-    """
-    If versioning is being used then we pass any `resolve` calls through
-    to the versioning scheme instance, so that the resulting view name
-    can be modified if needed.
-    """
-    scheme = getattr(request, 'versioning_scheme', None)
-    if scheme is not None:
-        return scheme.resolve(path, urlconf, request)
-    return django_resolve(path, urlconf)
-
-
 def reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra):
     """
     If versioning is being used then we pass any `reverse` calls through
diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py
index a76da17a..51b886f3 100644
--- a/rest_framework/versioning.py
+++ b/rest_framework/versioning.py
@@ -1,8 +1,6 @@
 # coding: utf-8
 from __future__ import unicode_literals
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import resolve as django_resolve
-from django.core.urlresolvers import ResolverMatch
 from rest_framework import exceptions
 from rest_framework.compat import unicode_http_header
 from rest_framework.reverse import _reverse
@@ -26,9 +24,6 @@ class BaseVersioning(object):
     def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra):
         return _reverse(viewname, args, kwargs, request, format, **extra)
 
-    def resolve(self, path, urlconf=None):
-        return django_resolve(path, urlconf)
-
     def is_allowed_version(self, version):
         if not self.allowed_versions:
             return True
@@ -127,21 +122,13 @@ class NamespaceVersioning(BaseVersioning):
 
     def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra):
         if request.version is not None:
-            viewname = request.version + ':' + viewname
+            viewname = self.get_versioned_viewname(viewname, request)
         return super(NamespaceVersioning, self).reverse(
             viewname, args, kwargs, request, format, **extra
         )
 
-    def resolve(self, path, urlconf=None, request=None):
-        match = django_resolve(path, urlconf)
-        if match.namespace:
-            _, view_name = match.view_name.split(':')
-            return ResolverMatch(func=match.func,
-                                 args=match.args,
-                                 kwargs=match.kwargs,
-                                 url_name=view_name,
-                                 app_name=match.app_name)
-        return match
+    def get_versioned_viewname(self, viewname, request):
+        return request.version + ':' + viewname
 
 
 class HostNameVersioning(BaseVersioning):
diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py
index f1b882ed..aede61d2 100644
--- a/tests/test_relations_hyperlink.py
+++ b/tests/test_relations_hyperlink.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.test import TestCase
 from rest_framework import serializers
 from rest_framework.test import APIRequestFactory
@@ -14,8 +14,7 @@ request = factory.get('/')  # Just to ensure we have a request in the serializer
 
 dummy_view = lambda request, pk: None
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^dummyurl/(?P<pk>[0-9]+)/$', dummy_view, name='dummy-url'),
     url(r'^manytomanysource/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanysource-detail'),
     url(r'^manytomanytarget/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanytarget-detail'),
@@ -24,7 +23,7 @@ urlpatterns = patterns(
     url(r'^nullableforeignkeysource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableforeignkeysource-detail'),
     url(r'^onetoonetarget/(?P<pk>[0-9]+)/$', dummy_view, name='onetoonetarget-detail'),
     url(r'^nullableonetoonesource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableonetoonesource-detail'),
-)
+]
 
 
 # ManyToMany
diff --git a/tests/test_versioning.py b/tests/test_versioning.py
index e7c8485e..cdd10065 100644
--- a/tests/test_versioning.py
+++ b/tests/test_versioning.py
@@ -1,4 +1,4 @@
-from .utils import MockObject, MockQueryset
+from .utils import MockObject, MockQueryset, UsingURLPatterns
 from django.conf.urls import include, url
 from django.core.exceptions import ObjectDoesNotExist
 from rest_framework import serializers
@@ -6,8 +6,9 @@ from rest_framework import status, versioning
 from rest_framework.decorators import APIView
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
-from rest_framework.test import APIRequestFactory, APITestCase, APISimpleTestCase
+from rest_framework.test import APIRequestFactory, APITestCase
 from rest_framework.versioning import NamespaceVersioning
+import pytest
 
 
 class RequestVersionView(APIView):
@@ -35,18 +36,6 @@ factory = APIRequestFactory()
 mock_view = lambda request: None
 dummy_view = lambda request, pk: None
 
-included_patterns = [
-    url(r'^namespaced/$', mock_view, name='another'),
-    url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail')
-]
-
-urlpatterns = [
-    url(r'^v1/', include(included_patterns, namespace='v1')),
-    url(r'^another/$', mock_view, name='another'),
-    url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another'),
-    url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail')
-]
-
 
 class TestRequestVersion:
     def test_unversioned(self):
@@ -121,8 +110,17 @@ class TestRequestVersion:
         assert response.data == {'version': None}
 
 
-class TestURLReversing(APITestCase):
-    urls = 'tests.test_versioning'
+class TestURLReversing(UsingURLPatterns, APITestCase):
+    included = [
+        url(r'^namespaced/$', mock_view, name='another'),
+        url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail')
+    ]
+
+    urlpatterns = [
+        url(r'^v1/', include(included, namespace='v1')),
+        url(r'^another/$', mock_view, name='another'),
+        url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another'),
+    ]
 
     def test_reverse_unversioned(self):
         view = ReverseView.as_view()
@@ -230,10 +228,18 @@ class TestInvalidVersion:
         assert response.status_code == status.HTTP_404_NOT_FOUND
 
 
-class TestHyperlinkedRelatedField(APISimpleTestCase):
-    urls = 'tests.test_versioning'
+class TestHyperlinkedRelatedField(UsingURLPatterns, APITestCase):
+    included = [
+        url(r'^namespaced/(?P<pk>\d+)/$', mock_view, name='namespaced'),
+    ]
+
+    urlpatterns = [
+        url(r'^v1/', include(included, namespace='v1')),
+        url(r'^v2/', include(included, namespace='v2'))
+    ]
 
     def setUp(self):
+        super(TestHyperlinkedRelatedField, self).setUp()
 
         class HyperlinkedMockQueryset(MockQueryset):
             def get(self, **lookup):
@@ -248,13 +254,15 @@ class TestHyperlinkedRelatedField(APISimpleTestCase):
             MockObject(pk=3, name='baz')
         ])
         self.field = serializers.HyperlinkedRelatedField(
-            view_name='example-detail',
+            view_name='namespaced',
             queryset=self.queryset
         )
         request = factory.post('/', urlconf='tests.test_versioning')
         request.versioning_scheme = NamespaceVersioning()
+        request.version = 'v1'
         self.field._context = {'request': request}
 
     def test_bug_2489(self):
-        self.field.to_internal_value('/example/3/')
-        self.field.to_internal_value('/v1/example/3/')
+        self.field.to_internal_value('/v1/namespaced/3/')
+        with pytest.raises(serializers.ValidationError):
+            self.field.to_internal_value('/v2/namespaced/3/')
diff --git a/tests/utils.py b/tests/utils.py
index 5b2d7586..b9034996 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -2,6 +2,30 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import NoReverseMatch
 
 
+class UsingURLPatterns(object):
+    """
+    Isolates URL patterns used during testing on the test class itself.
+    For example:
+
+    class MyTestCase(UsingURLPatterns, TestCase):
+        urlpatterns = [
+            ...
+        ]
+
+        def test_something(self):
+            ...
+    """
+    urls = __name__
+
+    def setUp(self):
+        global urlpatterns
+        urlpatterns = self.urlpatterns
+
+    def tearDown(self):
+        global urlpatterns
+        urlpatterns = []
+
+
 class MockObject(object):
     def __init__(self, **kwargs):
         self._kwargs = kwargs
-- 
cgit v1.2.3


From f98f842827c6e79bbaa196482e3c3c549e8999c8 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 5 Feb 2015 01:24:55 +0000
Subject: Minor bits of test cleanup

---
 tests/test_versioning.py | 39 +++++++++++++++------------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/tests/test_versioning.py b/tests/test_versioning.py
index cdd10065..553463d1 100644
--- a/tests/test_versioning.py
+++ b/tests/test_versioning.py
@@ -1,6 +1,5 @@
-from .utils import MockObject, MockQueryset, UsingURLPatterns
+from .utils import UsingURLPatterns
 from django.conf.urls import include, url
-from django.core.exceptions import ObjectDoesNotExist
 from rest_framework import serializers
 from rest_framework import status, versioning
 from rest_framework.decorators import APIView
@@ -33,8 +32,8 @@ class RequestInvalidVersionView(APIView):
 
 factory = APIRequestFactory()
 
-mock_view = lambda request: None
-dummy_view = lambda request, pk: None
+dummy_view = lambda request: None
+dummy_pk_view = lambda request, pk: None
 
 
 class TestRequestVersion:
@@ -112,14 +111,14 @@ class TestRequestVersion:
 
 class TestURLReversing(UsingURLPatterns, APITestCase):
     included = [
-        url(r'^namespaced/$', mock_view, name='another'),
-        url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail')
+        url(r'^namespaced/$', dummy_view, name='another'),
+        url(r'^example/(?P<pk>\d+)/$', dummy_pk_view, name='example-detail')
     ]
 
     urlpatterns = [
         url(r'^v1/', include(included, namespace='v1')),
-        url(r'^another/$', mock_view, name='another'),
-        url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another'),
+        url(r'^another/$', dummy_view, name='another'),
+        url(r'^(?P<version>[^/]+)/another/$', dummy_view, name='another'),
     ]
 
     def test_reverse_unversioned(self):
@@ -230,7 +229,7 @@ class TestInvalidVersion:
 
 class TestHyperlinkedRelatedField(UsingURLPatterns, APITestCase):
     included = [
-        url(r'^namespaced/(?P<pk>\d+)/$', mock_view, name='namespaced'),
+        url(r'^namespaced/(?P<pk>\d+)/$', dummy_view, name='namespaced'),
     ]
 
     urlpatterns = [
@@ -241,28 +240,20 @@ class TestHyperlinkedRelatedField(UsingURLPatterns, APITestCase):
     def setUp(self):
         super(TestHyperlinkedRelatedField, self).setUp()
 
-        class HyperlinkedMockQueryset(MockQueryset):
-            def get(self, **lookup):
-                for item in self.items:
-                    if item.pk == int(lookup.get('pk', -1)):
-                        return item
-                raise ObjectDoesNotExist()
-
-        self.queryset = HyperlinkedMockQueryset([
-            MockObject(pk=1, name='foo'),
-            MockObject(pk=2, name='bar'),
-            MockObject(pk=3, name='baz')
-        ])
+        class MockQueryset(object):
+            def get(self, pk):
+                return 'object %s' % pk
+
         self.field = serializers.HyperlinkedRelatedField(
             view_name='namespaced',
-            queryset=self.queryset
+            queryset=MockQueryset()
         )
-        request = factory.post('/', urlconf='tests.test_versioning')
+        request = factory.get('/')
         request.versioning_scheme = NamespaceVersioning()
         request.version = 'v1'
         self.field._context = {'request': request}
 
     def test_bug_2489(self):
-        self.field.to_internal_value('/v1/namespaced/3/')
+        assert self.field.to_internal_value('/v1/namespaced/3/') == 'object 3'
         with pytest.raises(serializers.ValidationError):
             self.field.to_internal_value('/v2/namespaced/3/')
-- 
cgit v1.2.3