Fix broken urlresolvers imports on Django 2.0

oauth2_provider/compat.py

@@ -15,3 +15,9 @@
     from urllib import urlencode, unquote_plus
 except ImportError:
     from urllib.parse import urlencode, 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_lazy

oauth2_provider/models.py

@@ -4,7 +4,6 @@
 
 from django.apps import apps
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.db import models, transaction
 from django.utils import timezone
 
@@ -13,7 +12,7 @@
 from django.core.exceptions import ImproperlyConfigured
 
 from .settings import oauth2_settings
-from .compat import parse_qsl, urlparse
+from .compat import parse_qsl, reverse, urlparse
 from .generators import generate_client_secret, generate_client_id
 from .validators import validate_uris
 

oauth2_provider/tests/test_application_views.py

@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 
+from ..compat import reverse
 from ..models import get_application_model
 
 

oauth2_provider/tests/test_authorization_code.py

@@ -5,11 +5,10 @@
 import datetime
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
 from django.test import TestCase, RequestFactory
 from django.utils import timezone
 
-from ..compat import urlparse, parse_qs, urlencode
+from ..compat import parse_qs, reverse, urlparse, urlencode
 from ..models import get_application_model, Grant, AccessToken, RefreshToken
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView

oauth2_provider/tests/test_client_credential.py

@@ -7,13 +7,13 @@
 except ImportError:
     import urllib
 
-from django.core.urlresolvers import reverse
 from django.contrib.auth import get_user_model
 from django.test import TestCase, RequestFactory
 from django.views.generic import View
 
 from oauthlib.oauth2 import BackendApplicationServer
 
+from ..compat import reverse
 from ..models import get_application_model, AccessToken
 from ..oauth2_backends import OAuthLibCore
 from ..oauth2_validators import OAuth2Validator

oauth2_provider/tests/test_implicit.py

@@ -1,10 +1,9 @@
 from __future__ import unicode_literals
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
 from django.test import TestCase, RequestFactory
 
-from ..compat import urlparse, parse_qs, urlencode
+from ..compat import parse_qs, reverse, urlparse, urlencode
 from ..models import get_application_model
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView

oauth2_provider/tests/test_password.py

@@ -3,9 +3,9 @@
 import json
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
 from django.test import TestCase, RequestFactory
 
+from ..compat import reverse
 from ..models import get_application_model
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView

oauth2_provider/tests/test_scopes.py

@@ -4,11 +4,10 @@
 
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse
 from django.test import TestCase, RequestFactory
 
 from .test_utils import TestCaseUtils
-from ..compat import urlparse, parse_qs
+from ..compat import parse_qs, reverse, urlparse
 from ..models import get_application_model, Grant, AccessToken
 from ..settings import oauth2_settings
 from ..views import ScopedProtectedResourceView, ReadWriteScopedResourceView

oauth2_provider/tests/test_token_revocation.py

@@ -3,11 +3,10 @@
 import datetime
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
 from django.test import TestCase, RequestFactory
 from django.utils import timezone
 
-from ..compat import urlencode
+from ..compat import reverse, urlencode
 from ..models import get_application_model, AccessToken, RefreshToken
 from ..settings import oauth2_settings
 

oauth2_provider/tests/test_token_view.py

@@ -3,10 +3,10 @@
 import datetime
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.utils import timezone
 
+from ..compat import reverse
 from ..models import get_application_model, AccessToken
 
 

oauth2_provider/views/application.py

@@ -1,9 +1,9 @@
-from django.core.urlresolvers import reverse_lazy
 from django.forms.models import modelform_factory
 from django.views.generic import CreateView, DetailView, DeleteView, ListView, UpdateView
 
 from braces.views import LoginRequiredMixin
 
+from ..compat import reverse_lazy
 from ..models import get_application_model
 
 

oauth2_provider/views/token.py

@@ -5,6 +5,7 @@
 
 from braces.views import LoginRequiredMixin
 
+from ..compat import reverse_lazy
 from ..models import AccessToken