diff --git a/readthedocs/core/fixtures/eric.json b/readthedocs/core/fixtures/eric.json index 1ab201c90..c380e1cf5 100644 --- a/readthedocs/core/fixtures/eric.json +++ b/readthedocs/core/fixtures/eric.json @@ -12,7 +12,7 @@ "last_login": "2010-08-14 01:51:05", "groups": [], "user_permissions": [], - "password": "sha1$035cb$156ad6cb44332fb4f24bcb634142a67435be0b37", + "password": "pbkdf2_sha256$30000$Vs87OlKZEzCb$nUw1o5pGQw7ff/QhnleSpUOupBaT1DogZrVaoZyQRyc=", "email": "e@e.co", "date_joined": "2010-08-14 01:50:58" } @@ -30,7 +30,7 @@ "last_login": "2010-08-14 01:51:05", "groups": [], "user_permissions": [], - "password": "sha1$035cb$156ad6cb44332fb4f24bcb634142a67435be0b37", + "password": "pbkdf2_sha256$30000$Vs87OlKZEzCb$nUw1o5pGQw7ff/QhnleSpUOupBaT1DogZrVaoZyQRyc=", "email": "e@etest.co", "date_joined": "2010-08-14 01:50:58" } @@ -48,7 +48,7 @@ "last_login": "2010-08-14 01:51:05", "groups": [], "user_permissions": [], - "password": "sha1$035cb$156ad6cb44332fb4f24bcb634142a67435be0b37", + "password": "pbkdf2_sha256$30000$Vs87OlKZEzCb$nUw1o5pGQw7ff/QhnleSpUOupBaT1DogZrVaoZyQRyc=", "email": "e@e.co", "date_joined": "2010-08-14 01:50:58" } diff --git a/readthedocs/core/middleware.py b/readthedocs/core/middleware.py index 72678c0b2..104572921 100644 --- a/readthedocs/core/middleware.py +++ b/readthedocs/core/middleware.py @@ -1,19 +1,21 @@ """Middleware for core app.""" -from __future__ import absolute_import -from builtins import object +from __future__ import ( + absolute_import, division, print_function, unicode_literals) + import logging -from django.utils.translation import ugettext_lazy as _ from django.conf import settings from django.contrib.sessions.middleware import SessionMiddleware from django.core.cache import cache -from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned -from django.core.urlresolvers import set_urlconf, get_urlconf +from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist +from django.core.urlresolvers import get_urlconf, set_urlconf from django.http import Http404, HttpResponseBadRequest +from django.utils.deprecation import MiddlewareMixin +from django.utils.translation import ugettext_lazy as _ from readthedocs.core.utils import cname_to_slug -from readthedocs.projects.models import Project, Domain +from readthedocs.projects.models import Domain, Project log = logging.getLogger(__name__) @@ -30,7 +32,7 @@ SINGLE_VERSION_URLCONF = getattr( ) -class SubdomainMiddleware(object): +class SubdomainMiddleware(MiddlewareMixin): """Middleware to display docs for non-dashboard domains.""" @@ -138,12 +140,12 @@ class SubdomainMiddleware(object): return response -class SingleVersionMiddleware(object): +class SingleVersionMiddleware(MiddlewareMixin): """ Reset urlconf for requests for 'single_version' docs. - In settings.MIDDLEWARE_CLASSES, SingleVersionMiddleware must follow after + In settings.MIDDLEWARE, SingleVersionMiddleware must follow after SubdomainMiddleware. """ @@ -192,7 +194,7 @@ class SingleVersionMiddleware(object): # Forked from old Django -class ProxyMiddleware(object): +class ProxyMiddleware(MiddlewareMixin): """ Middleware that sets REMOTE_ADDR based on HTTP_X_FORWARDED_FOR, if the. diff --git a/readthedocs/projects/fixtures/test_data.json b/readthedocs/projects/fixtures/test_data.json index 34c4eaf5d..c2315af83 100644 --- a/readthedocs/projects/fixtures/test_data.json +++ b/readthedocs/projects/fixtures/test_data.json @@ -281,7 +281,7 @@ "last_login": "2010-08-14 01:51:05", "groups": [], "user_permissions": [], - "password": "sha1$efaa6$17551368b198ef0dffcbf388908b7a609ec22eb1", + "password": "pbkdf2_sha256$30000$Vs87OlKZEzCb$nUw1o5pGQw7ff/QhnleSpUOupBaT1DogZrVaoZyQRyc=", "email": "e@etest.co", "date_joined": "2010-08-14 01:50:58" } diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py index 5cc179fb5..da520d3fd 100644 --- a/readthedocs/settings/base.py +++ b/readthedocs/settings/base.py @@ -126,7 +126,7 @@ class CommunityBaseSettings(Settings): def USE_PROMOS(self): # noqa return 'readthedocsext.donate' in self.INSTALLED_APPS - MIDDLEWARE_CLASSES = ( + MIDDLEWARE = ( 'readthedocs.core.middleware.ProxyMiddleware', 'readthedocs.core.middleware.FooterNoSessionMiddleware', 'django.middleware.locale.LocaleMiddleware', diff --git a/requirements/pip.txt b/requirements/pip.txt index c626bc6dc..a42967068 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -16,7 +16,7 @@ mkdocs==0.17.3 # Markdown 3.0 breaks with older Django Rest Framework Markdown<3.0 -django==1.9.13 +django==1.10.8 six==1.11.0 future==0.16.0