From a4086bffd706cc03c7346002976a48192f068083 Mon Sep 17 00:00:00 2001 From: Ronald van Zon Date: Tue, 12 Dec 2017 15:15:40 +0100 Subject: [PATCH] Update MIDDLEWARE_CLASSES to represent new style. In Django 1.10 MIDDLEWARE_CLASSES is set to deprecated and is removed in Django 2.0. The SessionAuthenticationMiddleware is also removed from Django 2.0 and was already unconditionally enabled in Django 1.10. --- django_q/tests/settings.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/django_q/tests/settings.py b/django_q/tests/settings.py index 8bad66c..468d663 100644 --- a/django_q/tests/settings.py +++ b/django_q/tests/settings.py @@ -1,4 +1,5 @@ import os +import django BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -28,15 +29,24 @@ INSTALLED_APPS = ( 'django_redis' ) -MIDDLEWARE_CLASSES = ( - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -) +if django.VERSION[:2] < (1, 10): + MIDDLEWARE_CLASSES = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + ) +else: + MIDDLEWARE = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + ) ROOT_URLCONF = 'tests.urls'