|
1 | 1 | """Middleware for core app."""
|
2 | 2 |
|
3 |
| -from __future__ import absolute_import |
4 |
| -from builtins import object |
| 3 | +from __future__ import ( |
| 4 | + absolute_import, division, print_function, unicode_literals) |
| 5 | + |
5 | 6 | import logging
|
6 | 7 |
|
7 |
| -from django.utils.translation import ugettext_lazy as _ |
8 | 8 | from django.conf import settings
|
9 | 9 | from django.contrib.sessions.middleware import SessionMiddleware
|
10 | 10 | 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 |
13 | 13 | from django.http import Http404, HttpResponseBadRequest
|
| 14 | +from django.utils.deprecation import MiddlewareMixin |
| 15 | +from django.utils.translation import ugettext_lazy as _ |
14 | 16 |
|
15 | 17 | from readthedocs.core.utils import cname_to_slug
|
16 |
| -from readthedocs.projects.models import Project, Domain |
| 18 | +from readthedocs.projects.models import Domain, Project |
17 | 19 |
|
18 | 20 | log = logging.getLogger(__name__)
|
19 | 21 |
|
|
30 | 32 | )
|
31 | 33 |
|
32 | 34 |
|
33 |
| -class SubdomainMiddleware(object): |
| 35 | +class SubdomainMiddleware(MiddlewareMixin): |
34 | 36 |
|
35 | 37 | """Middleware to display docs for non-dashboard domains."""
|
36 | 38 |
|
@@ -138,12 +140,12 @@ def process_response(self, request, response):
|
138 | 140 | return response
|
139 | 141 |
|
140 | 142 |
|
141 |
| -class SingleVersionMiddleware(object): |
| 143 | +class SingleVersionMiddleware(MiddlewareMixin): |
142 | 144 |
|
143 | 145 | """
|
144 | 146 | Reset urlconf for requests for 'single_version' docs.
|
145 | 147 |
|
146 |
| - In settings.MIDDLEWARE_CLASSES, SingleVersionMiddleware must follow after |
| 148 | + In settings.MIDDLEWARE, SingleVersionMiddleware must follow after |
147 | 149 | SubdomainMiddleware.
|
148 | 150 | """
|
149 | 151 |
|
@@ -192,7 +194,7 @@ def process_request(self, request):
|
192 | 194 |
|
193 | 195 |
|
194 | 196 | # Forked from old Django
|
195 |
| -class ProxyMiddleware(object): |
| 197 | +class ProxyMiddleware(MiddlewareMixin): |
196 | 198 |
|
197 | 199 | """
|
198 | 200 | Middleware that sets REMOTE_ADDR based on HTTP_X_FORWARDED_FOR, if the.
|
|
0 commit comments