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

Thanks Tim Graham and Simon Charette for the reviews.

1 files changed, 27 insertions, 28 deletions

diff --git a/tests/model_fields/test_promises.py b/tests/model_fields/test_promises.py
index 0dcb1abf3b..afbf36651a 100644
--- a/tests/model_fields/test_promises.py
+++ b/tests/model_fields/test_promises.py
@@ -10,7 +10,6 @@ from django.db.models.fields import (
 )
 from django.db.models.fields.files import FileField, ImageField
 from django.test import SimpleTestCase
-from django.utils import six
 from django.utils.functional import lazy
 
 
@@ -29,10 +28,10 @@ class PromiseTest(SimpleTestCase):
         self.assertIsInstance(BooleanField().get_prep_value(lazy_func()), bool)
 
     def test_CharField(self):
-        lazy_func = lazy(lambda: '', six.text_type)
-        self.assertIsInstance(CharField().get_prep_value(lazy_func()), six.text_type)
+        lazy_func = lazy(lambda: '', str)
+        self.assertIsInstance(CharField().get_prep_value(lazy_func()), str)
         lazy_func = lazy(lambda: 0, int)
-        self.assertIsInstance(CharField().get_prep_value(lazy_func()), six.text_type)
+        self.assertIsInstance(CharField().get_prep_value(lazy_func()), str)
 
     def test_DateField(self):
         lazy_func = lazy(lambda: datetime.date.today(), datetime.date)
@@ -47,44 +46,44 @@ class PromiseTest(SimpleTestCase):
         self.assertIsInstance(DecimalField().get_prep_value(lazy_func()), Decimal)
 
     def test_EmailField(self):
-        lazy_func = lazy(lambda: 'mailbox@domain.com', six.text_type)
-        self.assertIsInstance(EmailField().get_prep_value(lazy_func()), six.text_type)
+        lazy_func = lazy(lambda: 'mailbox@domain.com', str)
+        self.assertIsInstance(EmailField().get_prep_value(lazy_func()), str)
 
     def test_FileField(self):
-        lazy_func = lazy(lambda: 'filename.ext', six.text_type)
-        self.assertIsInstance(FileField().get_prep_value(lazy_func()), six.text_type)
+        lazy_func = lazy(lambda: 'filename.ext', str)
+        self.assertIsInstance(FileField().get_prep_value(lazy_func()), str)
         lazy_func = lazy(lambda: 0, int)
-        self.assertIsInstance(FileField().get_prep_value(lazy_func()), six.text_type)
+        self.assertIsInstance(FileField().get_prep_value(lazy_func()), str)
 
     def test_FilePathField(self):
-        lazy_func = lazy(lambda: 'tests.py', six.text_type)
-        self.assertIsInstance(FilePathField().get_prep_value(lazy_func()), six.text_type)
+        lazy_func = lazy(lambda: 'tests.py', str)
+        self.assertIsInstance(FilePathField().get_prep_value(lazy_func()), str)
         lazy_func = lazy(lambda: 0, int)
-        self.assertIsInstance(FilePathField().get_prep_value(lazy_func()), six.text_type)
+        self.assertIsInstance(FilePathField().get_prep_value(lazy_func()), str)
 
     def test_FloatField(self):
         lazy_func = lazy(lambda: 1.2, float)
         self.assertIsInstance(FloatField().get_prep_value(lazy_func()), float)
 
     def test_ImageField(self):
-        lazy_func = lazy(lambda: 'filename.ext', six.text_type)
-        self.assertIsInstance(ImageField().get_prep_value(lazy_func()), six.text_type)
+        lazy_func = lazy(lambda: 'filename.ext', str)
+        self.assertIsInstance(ImageField().get_prep_value(lazy_func()), str)
 
     def test_IntegerField(self):
         lazy_func = lazy(lambda: 1, int)
         self.assertIsInstance(IntegerField().get_prep_value(lazy_func()), int)
 
     def test_IPAddressField(self):
-        lazy_func = lazy(lambda: '127.0.0.1', six.text_type)
-        self.assertIsInstance(IPAddressField().get_prep_value(lazy_func()), six.text_type)
+        lazy_func = lazy(lambda: '127.0.0.1', str)
+        self.assertIsInstance(IPAddressField().get_prep_value(lazy_func()), str)
         lazy_func = lazy(lambda: 0, int)
-        self.assertIsInstance(IPAddressField().get_prep_value(lazy_func()), six.text_type)
+        self.assertIsInstance(IPAddressField().get_prep_value(lazy_func()), str)
 
     def test_GenericIPAddressField(self):
-        lazy_func = lazy(lambda: '127.0.0.1', six.text_type)
-        self.assertIsInstance(GenericIPAddressField().get_prep_value(lazy_func()), six.text_type)
+        lazy_func = lazy(lambda: '127.0.0.1', str)
+        self.assertIsInstance(GenericIPAddressField().get_prep_value(lazy_func()), str)
         lazy_func = lazy(lambda: 0, int)
-        self.assertIsInstance(GenericIPAddressField().get_prep_value(lazy_func()), six.text_type)
+        self.assertIsInstance(GenericIPAddressField().get_prep_value(lazy_func()), str)
 
     def test_NullBooleanField(self):
         lazy_func = lazy(lambda: True, bool)
@@ -99,25 +98,25 @@ class PromiseTest(SimpleTestCase):
         self.assertIsInstance(PositiveSmallIntegerField().get_prep_value(lazy_func()), int)
 
     def test_SlugField(self):
-        lazy_func = lazy(lambda: 'slug', six.text_type)
-        self.assertIsInstance(SlugField().get_prep_value(lazy_func()), six.text_type)
+        lazy_func = lazy(lambda: 'slug', str)
+        self.assertIsInstance(SlugField().get_prep_value(lazy_func()), str)
         lazy_func = lazy(lambda: 0, int)
-        self.assertIsInstance(SlugField().get_prep_value(lazy_func()), six.text_type)
+        self.assertIsInstance(SlugField().get_prep_value(lazy_func()), str)
 
     def test_SmallIntegerField(self):
         lazy_func = lazy(lambda: 1, int)
         self.assertIsInstance(SmallIntegerField().get_prep_value(lazy_func()), int)
 
     def test_TextField(self):
-        lazy_func = lazy(lambda: 'Abc', six.text_type)
-        self.assertIsInstance(TextField().get_prep_value(lazy_func()), six.text_type)
+        lazy_func = lazy(lambda: 'Abc', str)
+        self.assertIsInstance(TextField().get_prep_value(lazy_func()), str)
         lazy_func = lazy(lambda: 0, int)
-        self.assertIsInstance(TextField().get_prep_value(lazy_func()), six.text_type)
+        self.assertIsInstance(TextField().get_prep_value(lazy_func()), str)
 
     def test_TimeField(self):
         lazy_func = lazy(lambda: datetime.datetime.now().time(), datetime.time)
         self.assertIsInstance(TimeField().get_prep_value(lazy_func()), datetime.time)
 
     def test_URLField(self):
-        lazy_func = lazy(lambda: 'http://domain.com', six.text_type)
-        self.assertIsInstance(URLField().get_prep_value(lazy_func()), six.text_type)
+        lazy_func = lazy(lambda: 'http://domain.com', str)
+        self.assertIsInstance(URLField().get_prep_value(lazy_func()), str)