Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
[BD] Use settings.MIDDLEWARE instead of settings.MIDDLEWARE_CLASSES. (#…
Browse files Browse the repository at this point in the history
…981)

Use settings.MIDDLEWARE instead of settings.MIDDLEWARE_CLASSES.
Part of https://openedx.atlassian.net/browse/BOM-1360
  • Loading branch information
andrey-canon authored Mar 16, 2020
1 parent c6d0945 commit 6bf9cd8
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
5 changes: 3 additions & 2 deletions analytics_dashboard/core/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
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

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.
Expand All @@ -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.
"""
Expand Down
5 changes: 3 additions & 2 deletions analytics_dashboard/courses/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -17,7 +18,7 @@
logger = logging.getLogger(__name__)


class CourseMiddleware(object):
class CourseMiddleware(MiddlewareMixin):
"""
Adds course info to the request object.
"""
Expand All @@ -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.
"""
Expand Down
3 changes: 2 additions & 1 deletion analytics_dashboard/help/middleware.py
Original file line number Diff line number Diff line change
@@ -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.
"""
Expand Down
6 changes: 3 additions & 3 deletions analytics_dashboard/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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


Expand Down
4 changes: 2 additions & 2 deletions analytics_dashboard/settings/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
'debug_toolbar',
)

MIDDLEWARE_CLASSES += (
MIDDLEWARE += [
'debug_toolbar.middleware.DebugToolbarMiddleware',
)
]

DEBUG_TOOLBAR_PATCH_SETTINGS = False

Expand Down

0 comments on commit 6bf9cd8

Please sign in to comment.