Merge preakholt changes

tests/settings.py

@@ -1,6 +1,7 @@
-from __future__ import absolute_import, unicode_literals
-
 import os
+from distutils.version import StrictVersion as V
+
+import django
 
 DATABASES = {
     'default': {
@@ -52,16 +53,27 @@ TEMPLATES = [
     },
 ]
 
-MIDDLEWARE = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
-    'wagtail.core.middleware.SiteMiddleware',
-)
+def get_middleware_settings():
+    return (
+        'django.middleware.common.CommonMiddleware',
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.middleware.clickjacking.XFrameOptionsMiddleware',
+
+        'wagtail.core.middleware.SiteMiddleware',
+    )
+
+
+# Django 1.10 started to use "MIDDLEWARE" instead of "MIDDLEWARE_CLASSES".
+if V(django.get_version()) < V('1.10'):
+    MIDDLEWARE_CLASSES = get_middleware_settings()
+else:
+    MIDDLEWARE = get_middleware_settings()
+
 
 INSTALLED_APPS = (
     'wagtail_personalisation',