summaryrefslogtreecommitdiff
path: root/tests/modeltests/serializers
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-07-20 14:48:51 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-07-22 09:29:54 +0200
commitbdca5ea345c548a82a80d198906818c9ccbef896 (patch)
tree5c3f5fe5ad2522175d67b96a1fce1ff1763ba125 /tests/modeltests/serializers
parent3cb2457f46b3e40ff6b6acffcb3fd44cbea091e5 (diff)
[py3] Replaced unicode/str by six.text_type/bytes.
Diffstat (limited to 'tests/modeltests/serializers')
-rw-r--r--tests/modeltests/serializers/models.py3
-rw-r--r--tests/modeltests/serializers/tests.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/modeltests/serializers/models.py b/tests/modeltests/serializers/models.py
index 3549be1b4f..9da099c027 100644
--- a/tests/modeltests/serializers/models.py
+++ b/tests/modeltests/serializers/models.py
@@ -10,6 +10,7 @@ from __future__ import unicode_literals
from decimal import Decimal
from django.db import models
+from django.utils import six
class Category(models.Model):
@@ -100,7 +101,7 @@ class TeamField(models.CharField):
super(TeamField, self).__init__(max_length=100)
def get_db_prep_save(self, value, connection):
- return unicode(value.title)
+ return six.text_type(value.title)
def to_python(self, value):
if isinstance(value, Team):
diff --git a/tests/modeltests/serializers/tests.py b/tests/modeltests/serializers/tests.py
index 73a3aa3e7a..9177227539 100644
--- a/tests/modeltests/serializers/tests.py
+++ b/tests/modeltests/serializers/tests.py
@@ -296,7 +296,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 unicode(value)
+ return six.text_type(value)
@staticmethod
def _validate_output(serial_str):