Move MiddlewareMixin logic to oauth2_provider.compat

Author: jleclanche

oauth2_provider/compat.py

@@ -21,3 +21,12 @@
     from django.urls import reverse, reverse_lazy
 except ImportError:
     from django.core.urlresolvers import reverse, reverse_lazy
+
+# bastb Django 1.10 has updated Middleware. This code imports the Mixin required to get old-style
+# middleware working again
+# More?
+#  https://docs.djangoproject.com/en/1.10/topics/http/middleware/#upgrading-pre-django-1-10-style-middleware
+try:
+    from django.utils.deprecation import MiddlewareMixin
+except ImportError:
+    MiddlewareMixin = object

oauth2_provider/middleware.py

@@ -1,18 +1,9 @@
 from django.contrib.auth import authenticate
 from django.utils.cache import patch_vary_headers
+from .compat import MiddlewareMixin
 
-# bastb Django 1.10 has updated Middleware. This code imports the Mixin required to get old-style
-# middleware working again
-# More?
-#  https://docs.djangoproject.com/en/1.10/topics/http/middleware/#upgrading-pre-django-1-10-style-middleware
-try:
-    from django.utils.deprecation import MiddlewareMixin
-    middleware_parent_class = MiddlewareMixin
-except ImportError:
-    middleware_parent_class = object
 
-
-class OAuth2TokenMiddleware(middleware_parent_class):
+class OAuth2TokenMiddleware(MiddlewareMixin):
     """
     Middleware for OAuth2 user authentication