test: initial test fixes for Django 3+

Author: jerivas

tests/test_conf.py

@@ -1,17 +1,14 @@
-import sys
 import warnings
 from unittest import skipUnless
 
 from django.conf import settings as django_settings
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from mezzanine.conf import register_setting, registry, settings
 from mezzanine.conf.context_processors import TemplateSettings
 from mezzanine.conf.models import Setting
 from mezzanine.utils.tests import TestCase
 
-PY2 = sys.version_info[0] == 2
-
 
 class ConfTests(TestCase):
     @skipUnless(False, "Only run manually - see Github issue #1126")
@@ -130,15 +127,6 @@ def test_editable_override(self):
         second_value = settings.FOO
         self.assertEqual(first_value, second_value)
 
-    @skipUnless(PY2, "Needed only in Python 2")
-    def test_bytes_conversion(self):
-
-        settings.clear_cache()
-
-        register_setting(name="BYTES_TEST_SETTING", editable=True, default=b"")
-        Setting.objects.create(name="BYTES_TEST_SETTING", value="A unicode value")
-        self.assertEqual(settings.BYTES_TEST_SETTING, b"A unicode value")
-
     def test_invalid_value_warning(self):
         """
         Test that a warning is raised when a database setting has an invalid
@@ -264,9 +252,9 @@ def test_repr(self):
         self.assertIn("'EXTRA_THING'", repr(ts3))
         self.assertIn("'foo'", repr(ts3))
 
-    def test_force_text(self):
+    def test_force_str(self):
         ts = TemplateSettings(settings, [])
         with warnings.catch_warnings(record=True) as w:
             warnings.simplefilter("always")
-            self.assertEqual(force_text(ts), "{}")
+            self.assertEqual(force_str(ts), "{}")
         self.assertEqual(len(w), 0)

tests/test_pages.py

@@ -1,4 +1,5 @@
 from unittest import skipUnless
+from urllib.parse import urlparse
 
 from django.apps import apps
 from django.contrib.auth import get_user_model
@@ -11,7 +12,6 @@
 from django.template import Context, Template, TemplateSyntaxError
 from django.test.utils import override_settings
 from django.utils.http import urlquote_plus
-from django.utils.six.moves.urllib.parse import urlparse
 from django.utils.translation import get_language
 
 from mezzanine.conf import settings