From: Stephen Finucane <stephen.finucane@intel.com>
Date: Sat, 7 Nov 2015 01:20:05 +0000 (+0000)
Subject: Revert "Remove Django < 1.7 blocks"
X-Git-Tag: v1.1.0~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cdbbbca15095ed7e2c1bfc527c709997c2e7f48;p=thirdparty%2Fpatchwork.git

Revert "Remove Django < 1.7 blocks"

This reverts commit ea050ad02c61ff1f0bd03ffb02b4706817401aee.

To allow patchwork deployment on Enterpise versions of Linux, it is
necessary to continue to support Django 1.6.
---

diff --git a/patchwork/settings/base.py b/patchwork/settings/base.py
index 82c792c7..ae936223 100644
--- a/patchwork/settings/base.py
+++ b/patchwork/settings/base.py
@@ -37,8 +37,11 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.csrf.CsrfViewMiddleware',
 ]
 
-MIDDLEWARE_CLASSES.append(
-    'django.contrib.admindocs.middleware.XViewMiddleware')
+if django.VERSION < (1, 7):
+    MIDDLEWARE_CLASSES.append('django.middleware.doc.XViewMiddleware')
+else:
+    MIDDLEWARE_CLASSES.append(
+        'django.contrib.admindocs.middleware.XViewMiddleware')
 
 # Globalization
 
diff --git a/patchwork/settings/dev.py b/patchwork/settings/dev.py
index 62dfe2eb..e93249c6 100644
--- a/patchwork/settings/dev.py
+++ b/patchwork/settings/dev.py
@@ -41,9 +41,12 @@ DATABASES = {
     },
 }
 
-DATABASES['default']['TEST'] = {
-    'CHARSET': 'utf8',
-}
+if django.VERSION < (1, 7):
+    DATABASES['default']['TEST_CHARSET'] = 'utf8'
+else:
+    DATABASES['default']['TEST'] = {
+        'CHARSET': 'utf8',
+    }
 
 #
 # Patchwork settings
diff --git a/patchwork/settings/production.example.py b/patchwork/settings/production.example.py
index 41d6284a..9cf6712e 100644
--- a/patchwork/settings/production.example.py
+++ b/patchwork/settings/production.example.py
@@ -56,3 +56,4 @@ DATABASES = {
 #
 
 STATIC_ROOT = '/srv/patchwork/htdocs/static'
+
diff --git a/patchwork/tests/browser.py b/patchwork/tests/browser.py
index 0af56934..80285dbd 100644
--- a/patchwork/tests/browser.py
+++ b/patchwork/tests/browser.py
@@ -21,7 +21,10 @@ import errno
 import os
 import time
 
-from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+try:  # django 1.7+
+    from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+except:
+    from django.test import LiveServerTestCase as StaticLiveServerTestCase
 from selenium.common.exceptions import (
         NoSuchElementException, StaleElementReferenceException,
         TimeoutException)