Merge remote-tracking branch 'upstream/master'

Author: Aristobulo Meneses

.travis.yml

@@ -5,13 +5,10 @@ python:
 sudo: false
 
 env:
-  - TOXENV=py27-django18
   - TOXENV=py27-django110
   - TOXENV=py27-django111
-  - TOXENV=py34-django18
   - TOXENV=py34-django110
   - TOXENV=py34-django111
-  - TOXENV=py35-django18
   - TOXENV=py35-django110
   - TOXENV=py35-django111
   - TOXENV=py35-djangomaster

README.rst

@@ -48,8 +48,7 @@ Requirements
 ------------
 
 * Python 2.7, 3.4, 3.5, 3.6
-* Django 1.8, 1.10, 1.11
-* On Django 1.8: django-braces >= 1.11.0
+* Django 1.10, 1.11
 
 Installation
 ------------

docs/rest-framework/getting_started.rst

@@ -62,11 +62,13 @@ Here's our project's root `urls.py` module:
     class UserSerializer(serializers.ModelSerializer):
         class Meta:
             model = User
+            fields = ("username", "email", "first_name", "last_name", )
 
 
     class GroupSerializer(serializers.ModelSerializer):
         class Meta:
             model = Group
+            fields = ("name", )
 
 
     # ViewSets define the view behavior.

oauth2_provider/compat.py

@@ -16,18 +16,6 @@
 except ImportError:
     from urllib.parse import urlencode, quote_plus, unquote_plus
 
-# changed in Django 1.10 (broken in Django 2.0)
-try:
-    from django.urls import reverse, reverse_lazy
-except ImportError:
-    from django.core.urlresolvers import reverse, reverse_lazy
-
-# Added in Django 1.9, required as long as 1.8 is supported
-try:
-    from django.contrib.auth.mixins import LoginRequiredMixin
-except ImportError:
-    from braces.views import LoginRequiredMixin
-
 # bastb Django 1.10 has updated Middleware. This code imports the Mixin required to get old-style
 # middleware working again
 # More?

oauth2_provider/models.py

@@ -6,11 +6,12 @@
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models, transaction
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
-from .compat import parse_qsl, reverse, urlparse
+from .compat import parse_qsl, urlparse
 from .generators import generate_client_id, generate_client_secret
 from .scopes import get_scopes_backend
 from .settings import oauth2_settings

oauth2_provider/views/application.py

@@ -1,7 +1,8 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.forms.models import modelform_factory
+from django.urls import reverse_lazy
 from django.views.generic import CreateView, DeleteView, DetailView, ListView, UpdateView
 
-from ..compat import LoginRequiredMixin, reverse_lazy
 from ..models import get_application_model
 
 

oauth2_provider/views/base.py

@@ -1,5 +1,6 @@
 import logging
 
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpResponse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
@@ -8,7 +9,6 @@
 from django.views.generic import FormView, View
 
 from .mixins import OAuthLibMixin
-from ..compat import LoginRequiredMixin
 from ..exceptions import OAuthToolkitError
 from ..forms import AllowForm
 from ..http import HttpResponseUriRedirect
@@ -166,6 +166,7 @@ def get(self, request, *args, **kwargs):
             return self.error_response(error)
 
 
+@method_decorator(csrf_exempt, name="dispatch")
 class TokenView(OAuthLibMixin, View):
     """
     Implements an endpoint to provide access tokens
@@ -179,11 +180,6 @@ class TokenView(OAuthLibMixin, View):
     validator_class = oauth2_settings.OAUTH2_VALIDATOR_CLASS
     oauthlib_backend_class = oauth2_settings.OAUTH2_BACKEND_CLASS
 
-    # XXX: Django 1.8 compat
-    @method_decorator(csrf_exempt)
-    def dispatch(self, *args, **kwargs):
-        return super(TokenView, self).dispatch(*args, **kwargs)
-
     @method_decorator(sensitive_post_parameters('password'))
     def post(self, request, *args, **kwargs):
         url, headers, body, status = self.create_token_response(request)
@@ -194,6 +190,7 @@ def post(self, request, *args, **kwargs):
         return response
 
 
+@method_decorator(csrf_exempt, name="dispatch")
 class RevokeTokenView(OAuthLibMixin, View):
     """
     Implements an endpoint to revoke access or refresh tokens
@@ -202,10 +199,6 @@ class RevokeTokenView(OAuthLibMixin, View):
     validator_class = oauth2_settings.OAUTH2_VALIDATOR_CLASS
     oauthlib_backend_class = oauth2_settings.OAUTH2_BACKEND_CLASS
 
-    # XXX: Django 1.8 compat
-    def dispatch(self, *args, **kwargs):
-        return super(RevokeTokenView, self).dispatch(*args, **kwargs)
-
     def post(self, request, *args, **kwargs):
         url, headers, body, status = self.create_revocation_response(request)
         response = HttpResponse(content=body or '', status=status)

oauth2_provider/views/token.py

@@ -1,8 +1,9 @@
 from __future__ import absolute_import, unicode_literals
 
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.urls import reverse_lazy
 from django.views.generic import DeleteView, ListView
 
-from ..compat import LoginRequiredMixin, reverse_lazy
 from ..models import get_access_token_model
 
 

tests/test_application_views.py

@@ -2,8 +2,8 @@
 
 from django.contrib.auth import get_user_model
 from django.test import TestCase
+from django.urls import reverse
 
-from oauth2_provider.compat import reverse
 from oauth2_provider.models import get_application_model
 from oauth2_provider.settings import oauth2_settings
 from oauth2_provider.views.application import ApplicationRegistration

tests/test_authorization_code.py

@@ -6,9 +6,10 @@
 
 from django.contrib.auth import get_user_model
 from django.test import RequestFactory, TestCase
+from django.urls import reverse
 from django.utils import timezone
 
-from oauth2_provider.compat import parse_qs, reverse, urlencode, urlparse
+from oauth2_provider.compat import parse_qs, urlencode, urlparse
 from oauth2_provider.models import (
     get_access_token_model,
     get_application_model,