summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Péters <fpeters@entrouvert.com>2019-12-03 13:50:42 (GMT)
committerFrédéric Péters <fpeters@entrouvert.com>2019-12-03 13:50:42 (GMT)
commit1c810c703b37bc0054cd7b2891254c3d30ae2afc (patch)
treee9d63ca10144c3cd79823664cd5884c356ff8eb9
parent71ec5a61dd24686017500e14107b59699caf868e (diff)
downloadwelco-master.zip
welco-master.tar.gz
welco-master.tar.bz2
misc: update settings to use MIDDLEWARE (#38162)HEADv0.71master
-rw-r--r--tests/conftest.py2
-rw-r--r--welco/settings.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index aa578cc..3e5ba75 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -23,8 +23,6 @@ def app(request):
import django
wtm = django_webtest.WebTestMixin()
- if django.VERSION >= (1, 11):
- wtm._middleware_setting_name = 'MIDDLEWARE_CLASSES'
wtm._patch_settings()
request.addfinalizer(wtm._unpatch_settings)
return django_webtest.DjangoTestApp()
diff --git a/welco/settings.py b/welco/settings.py
index 02e3e58..f5643f6 100644
--- a/welco/settings.py
+++ b/welco/settings.py
@@ -54,7 +54,7 @@ INSTALLED_APPS = (
'rest_framework',
)
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',