Skip to content

Commit 1dfee29

Browse files
committed
1 parent 5056989 commit 1dfee29

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

readthedocs/core/middleware.py

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
"""Middleware for core app."""
22

3-
from __future__ import absolute_import
4-
from builtins import object
3+
from __future__ import (
4+
absolute_import, division, print_function, unicode_literals)
5+
56
import logging
67

7-
from django.utils.translation import ugettext_lazy as _
88
from django.conf import settings
99
from django.contrib.sessions.middleware import SessionMiddleware
1010
from django.core.cache import cache
11-
from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
12-
from django.core.urlresolvers import set_urlconf, get_urlconf
11+
from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
12+
from django.core.urlresolvers import get_urlconf, set_urlconf
1313
from django.http import Http404, HttpResponseBadRequest
14+
from django.utils.deprecation import MiddlewareMixin
15+
from django.utils.translation import ugettext_lazy as _
1416

1517
from readthedocs.core.utils import cname_to_slug
16-
from readthedocs.projects.models import Project, Domain
18+
from readthedocs.projects.models import Domain, Project
1719

1820
log = logging.getLogger(__name__)
1921

@@ -30,7 +32,7 @@
3032
)
3133

3234

33-
class SubdomainMiddleware(object):
35+
class SubdomainMiddleware(MiddlewareMixin):
3436

3537
"""Middleware to display docs for non-dashboard domains."""
3638

@@ -138,12 +140,12 @@ def process_response(self, request, response):
138140
return response
139141

140142

141-
class SingleVersionMiddleware(object):
143+
class SingleVersionMiddleware(MiddlewareMixin):
142144

143145
"""
144146
Reset urlconf for requests for 'single_version' docs.
145147
146-
In settings.MIDDLEWARE_CLASSES, SingleVersionMiddleware must follow after
148+
In settings.MIDDLEWARE, SingleVersionMiddleware must follow after
147149
SubdomainMiddleware.
148150
"""
149151

@@ -192,7 +194,7 @@ def process_request(self, request):
192194

193195

194196
# Forked from old Django
195-
class ProxyMiddleware(object):
197+
class ProxyMiddleware(MiddlewareMixin):
196198

197199
"""
198200
Middleware that sets REMOTE_ADDR based on HTTP_X_FORWARDED_FOR, if the.

readthedocs/settings/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def INSTALLED_APPS(self): # noqa
126126
def USE_PROMOS(self): # noqa
127127
return 'readthedocsext.donate' in self.INSTALLED_APPS
128128

129-
MIDDLEWARE_CLASSES = (
129+
MIDDLEWARE = (
130130
'readthedocs.core.middleware.ProxyMiddleware',
131131
'readthedocs.core.middleware.FooterNoSessionMiddleware',
132132
'django.middleware.locale.LocaleMiddleware',

0 commit comments

Comments
 (0)