From 68ac54a72b67547a3a9cd3d2ac06bb0878e66dfc Mon Sep 17 00:00:00 2001
From: Kaustubh Bhalerao <bhalerao.1@gmail.com>
Date: Mon, 15 Jun 2020 02:17:18 -0500
Subject: [PATCH] Django 3.0.4 (#107)

Co-authored-by: Kaustubh Bhalerao <bhalerao@soildiagnostics.com>
---
 dbtemplates/conf.py                               | 2 +-
 dbtemplates/management/commands/sync_templates.py | 8 ++++----
 dbtemplates/models.py                             | 2 +-
 dbtemplates/test_cases.py                         | 8 ++++----
 setup.py                                          | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dbtemplates/conf.py b/dbtemplates/conf.py
index 73b123e..3d9aeec 100644
--- a/dbtemplates/conf.py
+++ b/dbtemplates/conf.py
@@ -2,7 +2,7 @@ import posixpath
 
 from django.core.exceptions import ImproperlyConfigured
 from django.conf import settings
-from django.utils.six import string_types
+from six import string_types
 
 from appconf import AppConf
 
diff --git a/dbtemplates/management/commands/sync_templates.py b/dbtemplates/management/commands/sync_templates.py
index 65425ab..7ef8a72 100644
--- a/dbtemplates/management/commands/sync_templates.py
+++ b/dbtemplates/management/commands/sync_templates.py
@@ -5,13 +5,13 @@ from django.contrib.sites.models import Site
 from django.core.management.base import CommandError, BaseCommand
 from django.template.utils import get_app_template_dirs
 from django.template.loader import _engine_list
+try:
+    from six import input
+except ImportError:
+    pass
 
 from dbtemplates.models import Template
 
-# (propably obsolete) backwards compatability as django already threw out six
-if sys.version_info[0] == 2:
-    input = raw_input  # noqa: F821
-
 ALWAYS_ASK, FILES_TO_DATABASE, DATABASE_TO_FILES = ('0', '1', '2')
 
 DIRS = []
diff --git a/dbtemplates/models.py b/dbtemplates/models.py
index 152bbab..2c7976c 100644
--- a/dbtemplates/models.py
+++ b/dbtemplates/models.py
@@ -8,7 +8,7 @@ from django.contrib.sites.models import Site
 from django.db import models
 from django.db.models import signals
 from django.template import TemplateDoesNotExist
-from django.utils.six import python_2_unicode_compatible
+from six import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import now
 
diff --git a/dbtemplates/test_cases.py b/dbtemplates/test_cases.py
index c2d7e1f..e724f07 100644
--- a/dbtemplates/test_cases.py
+++ b/dbtemplates/test_cases.py
@@ -22,10 +22,10 @@ from dbtemplates.management.commands.sync_templates import (FILES_TO_DATABASE,
 
 class DbTemplatesTestCase(TestCase):
     def setUp(self):
-        self.old_template_loaders = settings.TEMPLATE_LOADERS
-        if 'dbtemplates.loader.Loader' not in settings.TEMPLATE_LOADERS:
+        self.old_TEMPLATES = settings.TEMPLATES
+        if 'dbtemplates.loader.Loader' not in settings.TEMPLATES:
             loader.template_source_loaders = None
-            settings.TEMPLATE_LOADERS = list(settings.TEMPLATE_LOADERS) + [
+            settings.TEMPLATES = list(settings.TEMPLATES) + [
                 'dbtemplates.loader.Loader'
             ]
 
@@ -41,7 +41,7 @@ class DbTemplatesTestCase(TestCase):
 
     def tearDown(self):
         loader.template_source_loaders = None
-        settings.TEMPLATE_LOADERS = self.old_template_loaders
+        settings.TEMPLATES = self.old_TEMPLATES
 
     def test_basics(self):
         self.assertEqual(list(self.t1.sites.all()), [self.site1])
diff --git a/setup.py b/setup.py
index 496e8de..9529139 100644
--- a/setup.py
+++ b/setup.py
@@ -58,5 +58,5 @@ setup(
         'Programming Language :: Python :: 3.7',
         'Framework :: Django',
     ],
-    install_requires=['django-appconf >= 0.4'],
+    install_requires=['django-appconf >= 0.4', 'six'],
 )