Refs #23919 -- Removed six.<various>_types usage

Thanks Tim Graham and Simon Charette for the reviews.
This commit is contained in:
Claude Paroz 2016-12-29 16:27:49 +01:00
parent f6acd1d271
commit 7b2f2e74ad
213 changed files with 574 additions and 763 deletions

View file

@ -1,7 +1,6 @@
from datetime import datetime
from django.test import TestCase
from django.utils import six
from .models import Article, Reporter, Writer
@ -23,7 +22,7 @@ class M2MIntermediaryTests(TestCase):
("John Smith", "Main writer"),
("Jane Doe", "Contributor"),
],
lambda w: (six.text_type(w.reporter), w.position)
lambda w: (str(w.reporter), w.position)
)
self.assertEqual(w1.reporter, r1)
self.assertEqual(w2.reporter, r2)
@ -35,5 +34,5 @@ class M2MIntermediaryTests(TestCase):
r1.writer_set.all(), [
("John Smith", "Main writer")
],
lambda w: (six.text_type(w.reporter), w.position)
lambda w: (str(w.reporter), w.position)
)