Refs #23919 -- Removed six.<various>_types usage

Thanks Tim Graham and Simon Charette for the reviews.

tests/i18n/contenttypes/tests.py

@@ -2,7 +2,7 @@ import os
 
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase, override_settings
-from django.utils import six, translation
+from django.utils import translation
 from django.utils._os import upath
 
 
@@ -21,6 +21,6 @@ class ContentTypeTests(TestCase):
     def test_verbose_name(self):
         company_type = ContentType.objects.get(app_label='i18n', model='company')
         with translation.override('en'):
-            self.assertEqual(six.text_type(company_type), 'Company')
+            self.assertEqual(str(company_type), 'Company')
         with translation.override('fr'):
-            self.assertEqual(six.text_type(company_type), 'Société')
+            self.assertEqual(str(company_type), 'Société')

tests/i18n/test_extraction.py

@@ -16,7 +16,6 @@ from django.core.management.commands.makemessages import \
 from django.core.management.utils import find_command
 from django.test import SimpleTestCase, mock, override_settings
 from django.test.utils import captured_stderr, captured_stdout
-from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.six import StringIO
 from django.utils.translation import TranslatorCommentWarning
@@ -69,7 +68,7 @@ class ExtractorTests(POFileAssertionMixin, RunInTmpDirMixin, SimpleTestCase):
         path = os.path.join(cwd_prefix, *comment_parts)
         parts = [path]
 
-        if isinstance(line_number, six.string_types):
+        if isinstance(line_number, str):
             line_number = self._get_token_line_number(path, line_number)
         if line_number is not None:
             parts.append(':%d' % line_number)

tests/i18n/tests.py

@@ -14,7 +14,7 @@ from django.template import Context, Template
 from django.test import (
     RequestFactory, SimpleTestCase, TestCase, override_settings,
 )
-from django.utils import six, translation
+from django.utils import translation
 from django.utils._os import upath
 from django.utils.formats import (
     date_format, get_format, get_format_modules, iter_format_modules, localize,
@@ -140,9 +140,9 @@ class TranslationTests(SimpleTestCase):
 
     def test_lazy_pickle(self):
         s1 = ugettext_lazy("test")
-        self.assertEqual(six.text_type(s1), "test")
+        self.assertEqual(str(s1), "test")
         s2 = pickle.loads(pickle.dumps(s1))
-        self.assertEqual(six.text_type(s2), "test")
+        self.assertEqual(str(s2), "test")
 
     @override_settings(LOCALE_PATHS=extended_locale_paths)
     def test_ungettext_lazy(self):