Middleware and urls update for django 2.2

diff --git a/pgweb/settings.py b/pgweb/settings.py
index cc9928c5ba926f6a75ba4f3d22fbeb58660aedd9..5de2054501b70027566c534282a78c5555dfb76b 100644 (file)
--- 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 81e98a7efabefbc946ffc3a33248435479769de5..a4d7f6892e463111cf30b7b116f14d65b8ea86ca 100644 (file)
--- 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 a6d1dd914014fa2ec88c460f75c62a0444b2050a..0656017395dd534103a3f9ca7b715736bfb41230 100644 (file)
--- 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()