trivial: Remove additional Django < 1.8 code

Yet more stuff that was missed in the previous changes.

Signed-off-by: Stephen Finucane <stephen@that.guru>

2 files changed, 25 insertions, 38 deletions

diff --git a/patchwork/settings/dev.py b/patchwork/settings/dev.py
index 26d3e83..1f686f4 100644
--- a/patchwork/settings/dev.py
+++ b/patchwork/settings/dev.py
@@ -25,11 +25,6 @@ SECRET_KEY = '00000000000000000000000000000000000000000000000000'  # noqa
 
 DEBUG = True
 
-if django.VERSION < (1, 8):
-    # In Django 1.8+, this is only necessary if the value differs from
-    # the value for 'DEBUG'
-    TEMPLATE_DEBUG = True
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
@@ -38,19 +33,15 @@ DATABASES = {
         'USER': os.getenv('PW_TEST_DB_USER', 'patchwork'),
         'PASSWORD': os.getenv('PW_TEST_DB_PASS', 'password'),
         'NAME': os.getenv('PW_TEST_DB_NAME', 'patchwork'),
+        'TEST': {
+            'CHARSET': 'utf8',
+        },
     },
 }
 
 if os.getenv('PW_TEST_DB_TYPE', None) == 'postgres':
     DATABASES['default']['ENGINE'] = 'django.db.backends.postgresql_psycopg2'
 
-if django.VERSION >= (1, 7):
-    DATABASES['default']['TEST'] = {
-        'CHARSET': 'utf8',
-    }
-else:
-    DATABASES['default']['TEST_CHARSET'] = 'utf8'
-
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
 #
@@ -68,27 +59,26 @@ PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']
 
 # django-debug-toolbar
 
-if django.VERSION >= (1, 8):
-    INSTALLED_APPS += [
-        'debug_toolbar'
-    ]
-
-    DEBUG_TOOLBAR_PATCH_SETTINGS = False
-
-    # This should go first in the 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',
-        '172.17.0.1'
-    ]
+INSTALLED_APPS += [
+    'debug_toolbar'
+]
+
+DEBUG_TOOLBAR_PATCH_SETTINGS = False
+
+# This should go first in the 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',
+    '172.17.0.1'
+]
 
 
 #
diff --git a/patchwork/settings/production.example.py b/patchwork/settings/production.example.py
index 03a0fb0..e97ba57 100644
--- a/patchwork/settings/production.example.py
+++ b/patchwork/settings/production.example.py
@@ -11,8 +11,6 @@ from __future__ import absolute_import
 
 import os
 
-import django
-
 from .base import *  # noqa
 
 #
@@ -74,6 +72,5 @@ DATABASES = {
 
 STATIC_ROOT = os.environ.get('STATIC_ROOT', '/srv/patchwork/htdocs/static')
 
-if django.VERSION >= (1, 7):
-    STATICFILES_STORAGE = \
-        'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
+STATICFILES_STORAGE = (
+    'django.contrib.staticfiles.storage.ManifestStaticFilesStorage')