summaryrefslogtreecommitdiff
path: root/tests/model_inheritance
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/model_inheritance
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/model_inheritance')
-rw-r--r--tests/model_inheritance/tests.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/model_inheritance/tests.py b/tests/model_inheritance/tests.py
index 8bb74d7ccb..feff4a1407 100644
--- a/tests/model_inheritance/tests.py
+++ b/tests/model_inheritance/tests.py
@@ -4,7 +4,6 @@ from django.core.exceptions import FieldError, ValidationError
from django.db import connection, models
from django.test import SimpleTestCase, TestCase
from django.test.utils import CaptureQueriesContext, isolate_apps
-from django.utils import six
from .models import (
Base, Chef, CommonInfo, GrandChild, GrandParent, ItalianRestaurant,
@@ -25,8 +24,8 @@ class ModelInheritanceTests(TestCase):
s = Student.objects.create(name="Pebbles", age=5, school_class="1B")
- self.assertEqual(six.text_type(w1), "Worker Fred")
- self.assertEqual(six.text_type(s), "Student Pebbles")
+ self.assertEqual(str(w1), "Worker Fred")
+ self.assertEqual(str(s), "Student Pebbles")
# The children inherit the Meta class of their parents (if they don't
# specify their own).