Compatibility with new middleware style

jazzband · Sep 25, 2016 · 3739b69 · 3739b69
1 parent 5ecea56
commit 3739b69
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/example/middleware.py b/example/middleware.py
@@ -1,4 +1,10 @@
-class SetRemoteAddrFromForwardedFor(object):
+try:
+    from django.utils.deprecation import MiddlewareMixin
+except ImportError:
+    class MiddlewareMixin(object): pass
+
+
+class SetRemoteAddrFromForwardedFor(MiddlewareMixin):
     """
     Middleware that sets REMOTE_ADDR based on HTTP_X_FORWARDED_FOR, if the
     latter is set. This is useful if you're sitting behind a reverse proxy that

diff --git a/example/settings.py b/example/settings.py
@@ -16,7 +16,7 @@
 
 SECRET_KEY = 'DO NOT USE THIS KEY!'
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'example.middleware.SetRemoteAddrFromForwardedFor',
     'user_sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',

diff --git a/user_sessions/middleware.py b/user_sessions/middleware.py
@@ -9,8 +9,13 @@
 except ImportError:
     from django.utils.importlib import import_module
 
+try:
+    from django.utils.deprecation import MiddlewareMixin
+except ImportError:
+    class MiddlewareMixin(object): pass
+
 
-class SessionMiddleware(object):
+class SessionMiddleware(MiddlewareMixin):
     """
     Middleware that provides ip and user_agent to the session store.
     """