diff options
Diffstat (limited to 'tests/expressions_case/tests.py')
| -rw-r--r-- | tests/expressions_case/tests.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/expressions_case/tests.py b/tests/expressions_case/tests.py index 414c4353a5..a662ffbc3b 100644 --- a/tests/expressions_case/tests.py +++ b/tests/expressions_case/tests.py @@ -9,7 +9,6 @@ from django.db import connection, models from django.db.models import F, Max, Min, Q, Sum, Value from django.db.models.expressions import Case, When from django.test import TestCase -from django.utils import six from .models import CaseTestModel, Client, FKCaseTestModel, O2OCaseTestModel @@ -648,7 +647,7 @@ class CaseExpressionTests(TestCase): self.assertQuerysetEqual( CaseTestModel.objects.all().order_by('pk'), [(1, b'one'), (2, b'two'), (3, b''), (2, b'two'), (3, b''), (3, b''), (4, b'')], - transform=lambda o: (o.integer, six.binary_type(o.binary)) + transform=lambda o: (o.integer, bytes(o.binary)) ) def test_update_boolean(self): @@ -757,7 +756,7 @@ class CaseExpressionTests(TestCase): self.assertQuerysetEqual( CaseTestModel.objects.all().order_by('pk'), [(1, '~/1'), (2, '~/2'), (3, ''), (2, '~/2'), (3, ''), (3, ''), (4, '')], - transform=lambda o: (o.integer, six.text_type(o.file)) + transform=lambda o: (o.integer, str(o.file)) ) def test_update_file_path(self): @@ -798,7 +797,7 @@ class CaseExpressionTests(TestCase): self.assertQuerysetEqual( CaseTestModel.objects.all().order_by('pk'), [(1, '~/1'), (2, '~/2'), (3, ''), (2, '~/2'), (3, ''), (3, ''), (4, '')], - transform=lambda o: (o.integer, six.text_type(o.image)) + transform=lambda o: (o.integer, str(o.image)) ) def test_update_generic_ip_address(self): |