aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--patchwork/settings/base.py13
-rw-r--r--patchwork/settings/dev.py11
2 files changed, 17 insertions, 7 deletions
diff --git a/patchwork/settings/base.py b/patchwork/settings/base.py
index d82c41d..8776a5e 100644
--- a/patchwork/settings/base.py
+++ b/patchwork/settings/base.py
@@ -26,7 +26,7 @@ INSTALLED_APPS = [
'patchwork',
]
-MIDDLEWARE_CLASSES = [
+_MIDDLEWARE_CLASSES = [
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -35,16 +35,21 @@ MIDDLEWARE_CLASSES = [
]
if django.VERSION >= (1, 7):
- MIDDLEWARE_CLASSES += [
+ _MIDDLEWARE_CLASSES += [
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
]
if django.VERSION >= (1, 7):
- MIDDLEWARE_CLASSES += [
+ _MIDDLEWARE_CLASSES += [
'django.contrib.admindocs.middleware.XViewMiddleware'
]
else:
- MIDDLEWARE_CLASSES += ['django.middleware.doc.XViewMiddleware']
+ _MIDDLEWARE_CLASSES += ['django.middleware.doc.XViewMiddleware']
+
+if django.VERSION >= (1, 10):
+ MIDDLEWARE = _MIDDLEWARE_CLASSES
+else:
+ MIDDLEWARE_CLASSES = _MIDDLEWARE_CLASSES
TIME_ZONE = 'Australia/Canberra'
diff --git a/patchwork/settings/dev.py b/patchwork/settings/dev.py
index 86b0f1b..26d3e83 100644
--- a/patchwork/settings/dev.py
+++ b/patchwork/settings/dev.py
@@ -76,9 +76,14 @@ if django.VERSION >= (1, 8):
DEBUG_TOOLBAR_PATCH_SETTINGS = False
# This should go first in the middleware classes
- MIDDLEWARE_CLASSES = [
- 'debug_toolbar.middleware.DebugToolbarMiddleware',
- ] + MIDDLEWARE_CLASSES
+ if django.VERSION >= (1, 10):
+ MIDDLEWARE = [
+ 'debug_toolbar.middleware.DebugToolbarMiddleware',
+ ] + MIDDLEWARE
+ else:
+ MIDDLEWARE_CLASSES = [
+ 'debug_toolbar.middleware.DebugToolbarMiddleware',
+ ] + MIDDLEWARE_CLASSES
INTERNAL_IPS = [
'127.0.0.1', '::1',