diff options
| author | Stephen Finucane <stephen@that.guru> | 2018-01-09 21:37:03 +0000 |
|---|---|---|
| committer | Stephen Finucane <stephen@that.guru> | 2018-01-09 23:59:51 +0000 |
| commit | 087929d3dc20c6c57cf14bf4ac5c2a4ca1328c54 (patch) | |
| tree | 5a749e0bc7b28a9435e13edd2cb48dda929b58c6 /patchwork/settings | |
| parent | 76750e9789ad10d45134c1ab59efa586007be984 (diff) | |
| download | patchwork-087929d3dc20c6c57cf14bf4ac5c2a4ca1328c54.tar patchwork-087929d3dc20c6c57cf14bf4ac5c2a4ca1328c54.tar.gz | |
trivial: Remove additional Django < 1.8 code
This is no longer necessary, given that we don't support Django 1.6 or
1.7. This was missed in a previous patch.
Signed-off-by: Stephen Finucane <stephen@that.guru>
Diffstat (limited to 'patchwork/settings')
| -rw-r--r-- | patchwork/settings/base.py | 60 |
1 files changed, 20 insertions, 40 deletions
diff --git a/patchwork/settings/base.py b/patchwork/settings/base.py index 6fd98a7..4b0d551 100644 --- a/patchwork/settings/base.py +++ b/patchwork/settings/base.py @@ -34,14 +34,9 @@ _MIDDLEWARE_CLASSES = [ 'django.contrib.admindocs.middleware.XViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', ] -if django.VERSION >= (1, 7): - _MIDDLEWARE_CLASSES += [ - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', - ] - - if django.VERSION >= (1, 10): MIDDLEWARE = _MIDDLEWARE_CLASSES else: @@ -61,41 +56,26 @@ _TEMPLATE_DIRS = [ os.path.join(ROOT_DIR, 'templates'), ] -if django.VERSION >= (1, 8): - TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': _TEMPLATE_DIRS, - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.contrib.auth.context_processors.auth', - 'django.template.context_processors.debug', - 'django.template.context_processors.i18n', - 'django.template.context_processors.media', - 'django.template.context_processors.static', - 'django.template.context_processors.tz', - 'django.contrib.messages.context_processors.messages', - 'patchwork.context_processors.site', - 'patchwork.context_processors.version', - ], - }, +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': _TEMPLATE_DIRS, + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.contrib.auth.context_processors.auth', + 'django.template.context_processors.debug', + 'django.template.context_processors.i18n', + 'django.template.context_processors.media', + 'django.template.context_processors.static', + 'django.template.context_processors.tz', + 'django.contrib.messages.context_processors.messages', + 'patchwork.context_processors.site', + 'patchwork.context_processors.version', + ], }, - ] -else: - TEMPLATE_DIRS = _TEMPLATE_DIRS - TEMPLATE_CONTEXT_PROCESSORS = [ - 'django.contrib.auth.context_processors.auth', - 'django.core.context_processors.debug', - 'django.core.context_processors.i18n', - 'django.core.context_processors.media', - 'django.core.context_processors.static', - 'django.core.context_processors.tz', - 'django.contrib.messages.context_processors.messages', - 'patchwork.context_processors.site', - 'patchwork.context_processors.version', - ] - + }, +] DEFAULT_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>' |