Merge ~shanepelletier/django-preflight:SN1842-upgrade-to-django3.2 into django-preflight:master

[Shane M. Pelletier]

Upgrade to Django >= 3.2

[David (lofidevops)]

LGTM!

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-preflight/24/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-preflight/25/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-preflight/26/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-preflight/27/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-preflight/28/

7033f90... by Shane M. Pelletier on 2023-07-31

Fix doctest

diff --git a/doc/install.rst b/doc/install.rst
index d8dfe41..bcf655e 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -52,13 +52,13 @@ should look like the following:
 
 .. testcode::
 
-    from django.conf.urls import include, url
+    from django.urls import include, re_path
 
     import preflight
     preflight.autodiscover()
 
     urlpatterns = [
-        url(r'^preflight/', include('preflight.urls')),
+        re_path(r'^preflight/', include('preflight.urls')),
     ]
 
 .. testoutput::
diff --git a/example_project/example_project/settings.py b/example_project/example_project/settings.py
index ca540b3..58a50f0 100644
--- a/example_project/example_project/settings.py
+++ b/example_project/example_project/settings.py
@@ -27,12 +27,11 @@ INSTALLED_APPS = [
     'app',
 ]
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
diff --git a/example_project/example_project/urls.py b/example_project/example_project/urls.py
index 04dc288..b1cb34a 100644
--- a/example_project/example_project/urls.py
+++ b/example_project/example_project/urls.py
@@ -1,10 +1,10 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 import preflight
-from django.conf.urls import include, url
+from django.urls import include, re_path
 
 preflight.autodiscover()
 
 urlpatterns = [
-    url(r'^preflight/', include('preflight.urls')),
+    re_path(r'^preflight/', include('preflight.urls')),
 ]
diff --git a/preflight/models.py b/preflight/models.py
index fb98037..e0940c0 100644
--- a/preflight/models.py
+++ b/preflight/models.py
@@ -16,10 +16,10 @@ import django
 from django import db
 from django.conf import settings
 from django.core.cache import caches
-from django.views.debug import HIDDEN_SETTINGS
 
 from .conf import ENABLE_SETTINGS
 
+HIDDEN_SETTINGS = re.compile(r"API|TOKEN|KEY|SECRET|PASS|SIGNATURE|HTTP_COOKIE", flags=re.IGNORECASE)
 REGISTRY = []
 
 
diff --git a/preflight/tests.py b/preflight/tests.py
index 8fd1e7f..ee6fc7e 100644
--- a/preflight/tests.py
+++ b/preflight/tests.py
@@ -15,7 +15,7 @@ import six
 from django.contrib.auth.models import AnonymousUser, User
 from django.conf import settings
 from django.core.management import call_command
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponse
 from django.test import TestCase
 from django.template import RequestContext
diff --git a/preflight/urls.py b/preflight/urls.py
index ddc9f75..a9e89aa 100644
--- a/preflight/urls.py
+++ b/preflight/urls.py
@@ -3,13 +3,13 @@ from __future__ import unicode_literals
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 import django
-from django.conf.urls import url
+from django.urls import re_path
 
 import preflight.views
 
 
 urlpatterns = [
-    url(r'^$', preflight.views.overview, name='preflight-overview'),
+    re_path(r'^$', preflight.views.overview, name='preflight-overview'),
 ]
 
 if django.VERSION[:2] < (1, 10):
diff --git a/preflight/views.py b/preflight/views.py
index 5db1a32..cad9046 100644
--- a/preflight/views.py
+++ b/preflight/views.py
@@ -77,7 +77,7 @@ def check_basic_auth(request):
 def allow_basic_auth(f):
     @functools.wraps(f)
     def wrapper(self, request):
-        if not request.user.is_authenticated():
+        if not request.user.is_authenticated:
             basic_user = check_basic_auth(request)
             if basic_user is not None:
                 request.user = basic_user
diff --git a/setup.py b/setup.py
index 31ba70e..1dbadaf 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,8 @@ setup(
     },
     install_requires=[
         'django >= 1.4',
-        'future >= 0.15.2'
+        'future >= 0.15.2',
+        'six'
     ],
     tests_require=tests_require,
     extras_require={
diff --git a/tox.ini b/tox.ini
index 60ef9c0..e1a754f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,7 @@
 [tox]
 envlist =
-    py27-django1.7, py27-django1.8, py27-django1.9, py27-django1.10, py27-django1.11,
-    py35-django1.11,
-    docs
+    py36, py37, py38, py39, docs
+skip_missing_interpreters = true
 
 [testenv]
 commands=python manage.py test preflight
@@ -11,6 +10,9 @@ deps =
     pip == 18.1
     mock > 0.6
     pyquery
+    django>=3.2
+    six
+    future
 install_command = pip install {opts} {packages}
 
 [testenv:docs]
@@ -19,42 +21,4 @@ changedir=doc
 deps=sphinx
 commands=
     sphinx-build -b doctest -d {envtmpdir}/doctrees . {envtmpdir}/doctest
-    sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
-
-[testenv:py27]
-basepython = python2.7
-
-[testenv:py35]
-basepython = python3.5
-
-[testenv:py27-django1.7]
-deps =
-    {[testenv]deps}
-    gargoyle >= 0.6.0
-    django >= 1.7, < 1.8
-
-[testenv:py27-django1.8]
-deps =
-    {[testenv]deps}
-    gargoyle >= 0.6.0
-    django >= 1.8, < 1.9
-
-[testenv:py27-django1.9]
-deps =
-    {[testenv]deps}
-    django >= 1.9, < 1.10
-
-[testenv:py27-django1.10]
-deps =
-    {[testenv]deps}
-    django >= 1.10, < 1.11
-
-[testenv:py27-django1.11]
-deps =
-    {[testenv]deps}
-    django >= 1.11, < 1.12
-
-[testenv:py35-django1.11]
-deps =
-    {[testenv]deps}
-    django >= 1.11, < 1.12
+    sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
\ No newline at end of file