From e02761dfcf0d41a2adca2085e826e405a724e977 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Tue, 31 Mar 2020 22:50:08 +0200
Subject: [PATCH] Middleware and urls update for django 2.2

---
 pgweb/settings.py        |  2 +-
 pgweb/urls.py            |  2 +-
 pgweb/util/middleware.py | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pgweb/settings.py b/pgweb/settings.py
index cc9928c5..5de20545 100644
--- a/pgweb/settings.py
+++ b/pgweb/settings.py
@@ -49,7 +49,7 @@ STATICFILES_DIRS = (
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'REALLYCHANGETHISINSETTINGS_LOCAL.PY'
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
diff --git a/pgweb/urls.py b/pgweb/urls.py
index 81e98a7e..a4d7f689 100644
--- a/pgweb/urls.py
+++ b/pgweb/urls.py
@@ -153,7 +153,7 @@ urlpatterns = [
     url(r'^admin/mergeorg/$', pgweb.core.views.admin_mergeorg),
 
     # Uncomment the next line to enable the admin:
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 
     # Crash testing URL :-)
     url(r'^crashtest/$', pgweb.misc.views.crashtest),
diff --git a/pgweb/util/middleware.py b/pgweb/util/middleware.py
index a6d1dd91..06560173 100644
--- a/pgweb/util/middleware.py
+++ b/pgweb/util/middleware.py
@@ -22,15 +22,17 @@ def get_current_user():
 # General middleware for all middleware functionality specific to the pgweb
 # project.
 class PgMiddleware(object):
-    def process_view(self, request, view_func, view_args, view_kwargs):
-        return None
+    def __init__(self, get_response):
+        self.get_response = get_response
 
-    def process_request(self, request):
+    def __call__(self, request):
         # Thread local store for username, see comment at the top of this file
         _thread_locals.user = getattr(request, 'user', None)
         initialize_template_collection()
 
-    def process_response(self, request, response):
+        # Call the view
+        response = self.get_response(request)
+
         # Set xkey representing the templates that are in use so we can do efficient
         # varnish purging on commits.
         tlist = get_all_templates()