From a6c0d9e858be173012fe291cc3f838395e6421de Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephen.finucane@intel.com>
Date: Fri, 21 Aug 2015 15:32:19 +0100
Subject: [PATCH] settings: Fix deprecated 'TEST_CHARSET' warning

Resolve a 'RemovedInDjango19Warning' with the 'TEST_CHARSET' option.

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 patchwork/settings/dev.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/patchwork/settings/dev.py b/patchwork/settings/dev.py
index 3f2355d..e93249c 100644
--- a/patchwork/settings/dev.py
+++ b/patchwork/settings/dev.py
@@ -38,10 +38,16 @@ DATABASES = {
         'USER': os.environ['PW_TEST_DB_USER'],
         'PASSWORD': os.environ['PW_TEST_DB_PASS'],
         'NAME': 'patchwork',
-        'TEST_CHARSET': 'utf8',
     },
 }
 
+if django.VERSION < (1, 7):
+    DATABASES['default']['TEST_CHARSET'] = 'utf8'
+else:
+    DATABASES['default']['TEST'] = {
+        'CHARSET': 'utf8',
+    }
+
 #
 # Patchwork settings
 #
-- 
2.39.2