diff options
Diffstat (limited to 'tests/serializers')
| -rw-r--r-- | tests/serializers/models/base.py | 3 | ||||
| -rw-r--r-- | tests/serializers/test_xml.py | 3 | ||||
| -rw-r--r-- | tests/serializers/test_yaml.py | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/tests/serializers/models/base.py b/tests/serializers/models/base.py index aa55b87c61..9421578478 100644 --- a/tests/serializers/models/base.py +++ b/tests/serializers/models/base.py @@ -7,7 +7,6 @@ Serialization from decimal import Decimal from django.db import models -from django.utils import six class CategoryMetaDataManager(models.Manager): @@ -118,7 +117,7 @@ class TeamField(models.CharField): super(TeamField, self).__init__(max_length=100) def get_db_prep_save(self, value, connection): - return six.text_type(value.title) + return str(value.title) def to_python(self, value): if isinstance(value, Team): diff --git a/tests/serializers/test_xml.py b/tests/serializers/test_xml.py index 71b38d48fa..ea9677d87f 100644 --- a/tests/serializers/test_xml.py +++ b/tests/serializers/test_xml.py @@ -3,7 +3,6 @@ from xml.dom import minidom from django.core import serializers from django.core.serializers.xml_serializer import DTDForbidden from django.test import TestCase, TransactionTestCase -from django.utils import six from .tests import SerializersTestBase, SerializersTransactionTestBase @@ -34,7 +33,7 @@ class XmlSerializerTestCase(SerializersTestBase, TestCase): def _comparison_value(value): # The XML serializer handles everything as strings, so comparisons # need to be performed on the stringified value - return six.text_type(value) + return str(value) @staticmethod def _validate_output(serial_str): diff --git a/tests/serializers/test_yaml.py b/tests/serializers/test_yaml.py index 038227efea..f3988d7ff1 100644 --- a/tests/serializers/test_yaml.py +++ b/tests/serializers/test_yaml.py @@ -4,7 +4,6 @@ import unittest from django.core import management, serializers from django.core.serializers.base import DeserializationError from django.test import SimpleTestCase, TestCase, TransactionTestCase -from django.utils import six from django.utils.six import StringIO from .models import Author @@ -147,7 +146,7 @@ class YamlSerializerTestCase(SerializersTestBase, TestCase): # yaml.safe_load will return non-string objects for some # of the fields we are interested in, this ensures that # everything comes back as a string - if isinstance(field_value, six.string_types): + if isinstance(field_value, str): ret_list.append(field_value) else: ret_list.append(str(field_value)) |
