summaryrefslogtreecommitdiff
path: root/tests/select_related_regress
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-12-29 16:27:49 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-18 20:18:46 +0100
commit7b2f2e74adb36a4334e83130f6abc2f79d395235 (patch)
tree313387ba6a6f1311b43cf5fb4f2576d2d6c4f805 /tests/select_related_regress
parentf6acd1d271122d66de8061e75ae26137ddf02658 (diff)
downloaddjango-7b2f2e74adb36a4334e83130f6abc2f79d395235.tar.gz
Refs #23919 -- Removed six.<various>_types usage
Thanks Tim Graham and Simon Charette for the reviews.
Diffstat (limited to 'tests/select_related_regress')
-rw-r--r--tests/select_related_regress/tests.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/select_related_regress/tests.py b/tests/select_related_regress/tests.py
index bb5f7774a3..753114a6d2 100644
--- a/tests/select_related_regress/tests.py
+++ b/tests/select_related_regress/tests.py
@@ -1,5 +1,4 @@
from django.test import TestCase
-from django.utils import six
from .models import (
A, B, Building, C, Chick, Child, Class, Client, ClientStatus, Connection,
@@ -35,7 +34,7 @@ class SelectRelatedRegressTests(TestCase):
connections = Connection.objects.filter(start__device__building=b, end__device__building=b).order_by('id')
self.assertEqual(
- [(c.id, six.text_type(c.start), six.text_type(c.end)) for c in connections],
+ [(c.id, str(c.start), str(c.end)) for c in connections],
[(c1.id, 'router/4', 'switch/7'), (c2.id, 'switch/7', 'server/1')]
)
@@ -46,7 +45,7 @@ class SelectRelatedRegressTests(TestCase):
.order_by('id')
)
self.assertEqual(
- [(c.id, six.text_type(c.start), six.text_type(c.end)) for c in connections],
+ [(c.id, str(c.start), str(c.end)) for c in connections],
[(c1.id, 'router/4', 'switch/7'), (c2.id, 'switch/7', 'server/1')]
)