diff options
| author | Stephen Finucane <stephen.finucane@intel.com> | 2015-08-21 15:32:19 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2015-09-17 18:01:18 +0100 |
| commit | a6c0d9e858be173012fe291cc3f838395e6421de (patch) | |
| tree | 71bcb473da57ffee30a97b47bc216b5ae423b1f1 | |
| parent | 976a08c512715a3524548f606da97da1ca3b1f1a (diff) | |
| download | patchwork-a6c0d9e858be173012fe291cc3f838395e6421de.tar patchwork-a6c0d9e858be173012fe291cc3f838395e6421de.tar.gz | |
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>
| -rw-r--r-- | patchwork/settings/dev.py | 8 |
1 files changed, 7 insertions, 1 deletions
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 # |