Merge pull request #203 from willkg/201-django-20

django 2.0 support; drop django 1.10 support

docs/installation.rst

@@ -108,7 +108,7 @@ documentation for the appropriate values.
 
    You can find more info about `cookie-based sessions`_ in Django's documentation.
 
-.. _cookie-based sessions: https://docs.djangoproject.com/en/1.10/topics/http/sessions/#using-cookie-based-sessions
+.. _cookie-based sessions: https://docs.djangoproject.com/en/1.11/topics/http/sessions/#using-cookie-based-sessions
 
 
 These values relate to your site.
@@ -284,12 +284,12 @@ the email address at all:
    Django 1.8 username:
        https://docs.djangoproject.com/en/1.8/ref/contrib/auth/#django.contrib.auth.models.User.username
 
-   Django 1.10 username:
-       https://docs.djangoproject.com/en/1.10/ref/contrib/auth/#django.contrib.auth.models.User.username
-
    Django 1.11 username:
        https://docs.djangoproject.com/en/1.11/ref/contrib/auth/#django.contrib.auth.models.User.username
 
+   Django 2.0 username:
+       https://docs.djangoproject.com/en/2.0/ref/contrib/auth/#django.contrib.auth.models.User.username
+
 
 Changing how Django users are created
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

mozilla_django_oidc/auth.py

@@ -7,7 +7,11 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.backends import ModelBackend
 from django.core.exceptions import SuspiciousOperation, ImproperlyConfigured
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    # Django < 2.0.0
+    from django.core.urlresolvers import reverse
 from django.utils.encoding import force_bytes, smart_text, smart_bytes
 from django.utils.module_loading import import_string
 from django.utils import six

mozilla_django_oidc/middleware.py

@@ -7,7 +7,11 @@
     from urllib import urlencode
 
 import django
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    # Django < 2.0.0
+    from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.utils.crypto import get_random_string
 

mozilla_django_oidc/views.py

@@ -7,7 +7,11 @@
 
 import django
 from django.core.exceptions import SuspiciousOperation
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    # Django < 2.0.0
+    from django.core.urlresolvers import reverse
 from django.contrib import auth
 from django.http import HttpResponseRedirect
 from django.utils.crypto import get_random_string

setup.py

@@ -62,8 +62,8 @@
         'Development Status :: 3 - Alpha',
         'Framework :: Django',
         'Framework :: Django :: 1.8',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
         'Intended Audience :: Developers',
         'Operating System :: MacOS',

tests/test_views.py

@@ -10,7 +10,11 @@
 from django.core.exceptions import SuspiciousOperation
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    # Django < 2.0.0
+    from django.core.urlresolvers import reverse
 from django.test import RequestFactory, TestCase, override_settings
 
 from mozilla_django_oidc import views

tox.ini

@@ -2,8 +2,8 @@
 envlist =
     lint
     py{27,33,34,35}-django18
-    py{27,34,35}-django110
     py{27,34,35,36}-django111
+    py{34,35,36}-django200
 
 [travis]
 python =
@@ -21,8 +21,8 @@ setenv =
 deps =
     -r{toxinidir}/tests/requirements.txt
     django18: Django>=1.8,<1.9
-    django110: Django>=1.10,<1.11
-    django111: Django>=1.11
+    django111: Django>=1.11,<2.0.0
+    django200: Django>=2.0.0
 
 [testenv:coverage]
 commands =