diff --git a/wagtail/wagtailcore/middleware.py b/wagtail/wagtailcore/middleware.py index 4c9b0d377..0658b7527 100644 --- a/wagtail/wagtailcore/middleware.py +++ b/wagtail/wagtailcore/middleware.py @@ -1,9 +1,18 @@ from __future__ import absolute_import, unicode_literals +import django + from wagtail.wagtailcore.models import Site -class SiteMiddleware(object): +if django.VERSION >= (1, 10): + from django.utils.deprecation import MiddlewareMixin +else: + MiddlewareMixin = object + + + +class SiteMiddleware(MiddlewareMixin): def process_request(self, request): """ Set request.site to contain the Site object responsible for handling this request, diff --git a/wagtail/wagtailredirects/middleware.py b/wagtail/wagtailredirects/middleware.py index 5391dda6d..63720493e 100644 --- a/wagtail/wagtailredirects/middleware.py +++ b/wagtail/wagtailredirects/middleware.py @@ -1,11 +1,18 @@ from __future__ import absolute_import, unicode_literals +import django from django import http from django.utils.six.moves.urllib.parse import urlparse from wagtail.wagtailredirects import models +if django.VERSION >= (1, 10): + from django.utils.deprecation import MiddlewareMixin +else: + MiddlewareMixin = object + + def get_redirect(request, path): try: return models.Redirect.get_for_site(request.site).get(old_path=path) @@ -17,7 +24,7 @@ def get_redirect(request, path): # Originally pinched from: https://github.com/django/django/blob/master/django/contrib/redirects/middleware.py -class RedirectMiddleware(object): +class RedirectMiddleware(MiddlewareMixin): def process_response(self, request, response): # No need to check for a redirect for non-404 responses. if response.status_code != 404: