diff --git a/analytics_dashboard/core/middleware.py b/analytics_dashboard/core/middleware.py index 643e2648d..c3644cc1f 100644 --- a/analytics_dashboard/core/middleware.py +++ b/analytics_dashboard/core/middleware.py @@ -7,6 +7,7 @@ import logging from django.template.response import TemplateResponse +from django.utils.deprecation import MiddlewareMixin from lang_pref_middleware import middleware from core.exceptions import ServiceUnavailableError @@ -14,7 +15,7 @@ logger = logging.getLogger(__name__) -class LanguagePreferenceMiddleware(middleware.LanguagePreferenceMiddleware): +class LanguagePreferenceMiddleware(middleware.LanguagePreferenceMiddleware, MiddlewareMixin): def get_user_language_preference(self, user): """ Retrieve the given user's language preference. @@ -24,7 +25,7 @@ def get_user_language_preference(self, user): return user.language -class ServiceUnavailableExceptionMiddleware(object): +class ServiceUnavailableExceptionMiddleware(MiddlewareMixin): """ Display an error template for 502 errors. """ diff --git a/analytics_dashboard/courses/middleware.py b/analytics_dashboard/courses/middleware.py index 35476c827..e80635b2f 100644 --- a/analytics_dashboard/courses/middleware.py +++ b/analytics_dashboard/courses/middleware.py @@ -9,6 +9,7 @@ import six from django.http import Http404 from django.template.response import TemplateResponse +from django.utils.deprecation import MiddlewareMixin from opaque_keys import InvalidKeyError from opaque_keys.edx.keys import CourseKey @@ -17,7 +18,7 @@ logger = logging.getLogger(__name__) -class CourseMiddleware(object): +class CourseMiddleware(MiddlewareMixin): """ Adds course info to the request object. """ @@ -40,7 +41,7 @@ def process_view(self, request, _view_func, _view_args, view_kwargs): return None -class CoursePermissionsExceptionMiddleware(object): +class CoursePermissionsExceptionMiddleware(MiddlewareMixin): """ Display an error template for PermissionsNotFoundError exceptions. """ diff --git a/analytics_dashboard/help/middleware.py b/analytics_dashboard/help/middleware.py index bc9da02f7..eef2543b6 100644 --- a/analytics_dashboard/help/middleware.py +++ b/analytics_dashboard/help/middleware.py @@ -1,12 +1,13 @@ from __future__ import absolute_import +from django.utils.deprecation import MiddlewareMixin from rest_framework.response import Response from help import HELP_CONTEXT_TOKEN_NAME from help.utils import get_doc_url -class HelpURLMiddleware(object): +class HelpURLMiddleware(MiddlewareMixin): """ Adds a "help_url" entry to the response context. """ diff --git a/analytics_dashboard/settings/base.py b/analytics_dashboard/settings/base.py index 98ceecbea..65afe99bb 100644 --- a/analytics_dashboard/settings/base.py +++ b/analytics_dashboard/settings/base.py @@ -170,8 +170,8 @@ ########## MIDDLEWARE CONFIGURATION -# See: https://docs.djangoproject.com/en/dev/ref/settings/#middleware-classes -MIDDLEWARE_CLASSES = ( +# See: https://docs.djangoproject.com/en/1.11/ref/settings/#middleware-classes +MIDDLEWARE = [ 'edx_django_utils.cache.middleware.RequestCacheMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.locale.LocaleMiddleware', @@ -190,7 +190,7 @@ 'edx_django_utils.cache.middleware.TieredCacheMiddleware', 'edx_rest_framework_extensions.middleware.RequestMetricsMiddleware', 'edx_rest_framework_extensions.auth.jwt.middleware.EnsureJWTAuthSettingsMiddleware', -) +] ########## END MIDDLEWARE CONFIGURATION diff --git a/analytics_dashboard/settings/dev.py b/analytics_dashboard/settings/dev.py index cb55e4508..653f2b570 100644 --- a/analytics_dashboard/settings/dev.py +++ b/analytics_dashboard/settings/dev.py @@ -35,9 +35,9 @@ 'debug_toolbar', ) - MIDDLEWARE_CLASSES += ( + MIDDLEWARE += [ 'debug_toolbar.middleware.DebugToolbarMiddleware', - ) + ] DEBUG_TOOLBAR_PATCH_SETTINGS = False