Removed unneeded force_text calls in the test suite

1 files changed, 34 insertions, 35 deletions

diff --git a/tests/admin_filters/tests.py b/tests/admin_filters/tests.py
index 0df02708a8..4dc6c3365a 100644
--- a/tests/admin_filters/tests.py
+++ b/tests/admin_filters/tests.py
@@ -11,7 +11,6 @@ from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
 from django.core.exceptions import ImproperlyConfigured
 from django.test import RequestFactory, TestCase, override_settings
-from django.utils.encoding import force_text
 
 from .models import Book, Bookmark, Department, Employee, TaggedItem
 
@@ -332,7 +331,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][4]
-        self.assertEqual(force_text(filterspec.title), 'date registered')
+        self.assertEqual(filterspec.title, 'date registered')
         choice = select_by(filterspec.choices(changelist), "display", "Today")
         self.assertIs(choice['selected'], True)
         self.assertEqual(
@@ -357,7 +356,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][4]
-        self.assertEqual(force_text(filterspec.title), 'date registered')
+        self.assertEqual(filterspec.title, 'date registered')
         choice = select_by(filterspec.choices(changelist), "display", "This month")
         self.assertIs(choice['selected'], True)
         self.assertEqual(
@@ -382,7 +381,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][4]
-        self.assertEqual(force_text(filterspec.title), 'date registered')
+        self.assertEqual(filterspec.title, 'date registered')
         choice = select_by(filterspec.choices(changelist), "display", "This year")
         self.assertIs(choice['selected'], True)
         self.assertEqual(
@@ -405,7 +404,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][4]
-        self.assertEqual(force_text(filterspec.title), 'date registered')
+        self.assertEqual(filterspec.title, 'date registered')
         choice = select_by(filterspec.choices(changelist), "display", "Past 7 days")
         self.assertIs(choice['selected'], True)
         self.assertEqual(
@@ -427,7 +426,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][4]
-        self.assertEqual(force_text(filterspec.title), 'date registered')
+        self.assertEqual(filterspec.title, 'date registered')
         choice = select_by(filterspec.choices(changelist), 'display', 'No date')
         self.assertIs(choice['selected'], True)
         self.assertEqual(choice['query_string'], '?date_registered__isnull=True')
@@ -442,7 +441,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][4]
-        self.assertEqual(force_text(filterspec.title), 'date registered')
+        self.assertEqual(filterspec.title, 'date registered')
         choice = select_by(filterspec.choices(changelist), 'display', 'Has date')
         self.assertIs(choice['selected'], True)
         self.assertEqual(choice['query_string'], '?date_registered__isnull=False')
@@ -469,7 +468,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the last choice is None and is selected
         filterspec = changelist.get_filters(request)[0][0]
-        self.assertEqual(force_text(filterspec.title), 'year')
+        self.assertEqual(filterspec.title, 'year')
         choices = list(filterspec.choices(changelist))
         self.assertIs(choices[-1]['selected'], True)
         self.assertEqual(choices[-1]['query_string'], '?year__isnull=True')
@@ -479,7 +478,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][0]
-        self.assertEqual(force_text(filterspec.title), 'year')
+        self.assertEqual(filterspec.title, 'year')
         choices = list(filterspec.choices(changelist))
         self.assertIs(choices[2]['selected'], True)
         self.assertEqual(choices[2]['query_string'], '?year=2002')
@@ -520,7 +519,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the last choice is None and is selected
         filterspec = changelist.get_filters(request)[0][1]
-        self.assertEqual(force_text(filterspec.title), 'Verbose Author')
+        self.assertEqual(filterspec.title, 'Verbose Author')
         choices = list(filterspec.choices(changelist))
         self.assertIs(choices[-1]['selected'], True)
         self.assertEqual(choices[-1]['query_string'], '?author__isnull=True')
@@ -530,7 +529,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][1]
-        self.assertEqual(force_text(filterspec.title), 'Verbose Author')
+        self.assertEqual(filterspec.title, 'Verbose Author')
         # order of choices depends on User model, which has no order
         choice = select_by(filterspec.choices(changelist), "display", "alfred")
         self.assertIs(choice['selected'], True)
@@ -556,7 +555,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the last choice is None and is selected
         filterspec = changelist.get_filters(request)[0][2]
-        self.assertEqual(force_text(filterspec.title), 'Verbose Contributors')
+        self.assertEqual(filterspec.title, 'Verbose Contributors')
         choices = list(filterspec.choices(changelist))
         self.assertIs(choices[-1]['selected'], True)
         self.assertEqual(choices[-1]['query_string'], '?contributors__isnull=True')
@@ -566,7 +565,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][2]
-        self.assertEqual(force_text(filterspec.title), 'Verbose Contributors')
+        self.assertEqual(filterspec.title, 'Verbose Contributors')
         choice = select_by(filterspec.choices(changelist), "display", "bob")
         self.assertIs(choice['selected'], True)
         self.assertEqual(choice['query_string'], '?contributors__id__exact=%d' % self.bob.pk)
@@ -584,7 +583,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the last choice is None and is selected
         filterspec = changelist.get_filters(request)[0][0]
-        self.assertEqual(force_text(filterspec.title), 'book')
+        self.assertEqual(filterspec.title, 'book')
         choices = list(filterspec.choices(changelist))
         self.assertIs(choices[-1]['selected'], True)
         self.assertEqual(choices[-1]['query_string'], '?books_authored__isnull=True')
@@ -594,7 +593,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][0]
-        self.assertEqual(force_text(filterspec.title), 'book')
+        self.assertEqual(filterspec.title, 'book')
         choice = select_by(filterspec.choices(changelist), "display", self.bio_book.title)
         self.assertIs(choice['selected'], True)
         self.assertEqual(choice['query_string'], '?books_authored__id__exact=%d' % self.bio_book.pk)
@@ -609,7 +608,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the last choice is None and is selected
         filterspec = changelist.get_filters(request)[0][1]
-        self.assertEqual(force_text(filterspec.title), 'book')
+        self.assertEqual(filterspec.title, 'book')
         choices = list(filterspec.choices(changelist))
         self.assertIs(choices[-1]['selected'], True)
         self.assertEqual(choices[-1]['query_string'], '?books_contributed__isnull=True')
@@ -619,7 +618,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][1]
-        self.assertEqual(force_text(filterspec.title), 'book')
+        self.assertEqual(filterspec.title, 'book')
         choice = select_by(filterspec.choices(changelist), "display", self.django_book.title)
         self.assertIs(choice['selected'], True)
         self.assertEqual(choice['query_string'], '?books_contributed__id__exact=%d' % self.django_book.pk)
@@ -715,7 +714,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][3]
-        self.assertEqual(force_text(filterspec.title), 'is best seller')
+        self.assertEqual(filterspec.title, 'is best seller')
         choice = select_by(filterspec.choices(changelist), "display", "No")
         self.assertIs(choice['selected'], True)
         self.assertEqual(choice['query_string'], '?is_best_seller__exact=0')
@@ -729,7 +728,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][3]
-        self.assertEqual(force_text(filterspec.title), 'is best seller')
+        self.assertEqual(filterspec.title, 'is best seller')
         choice = select_by(filterspec.choices(changelist), "display", "Yes")
         self.assertIs(choice['selected'], True)
         self.assertEqual(choice['query_string'], '?is_best_seller__exact=1')
@@ -743,7 +742,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][3]
-        self.assertEqual(force_text(filterspec.title), 'is best seller')
+        self.assertEqual(filterspec.title, 'is best seller')
         choice = select_by(filterspec.choices(changelist), "display", "Unknown")
         self.assertIs(choice['selected'], True)
         self.assertEqual(choice['query_string'], '?is_best_seller__isnull=True')
@@ -777,7 +776,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][1]
-        self.assertEqual(force_text(filterspec.title), 'publication decade')
+        self.assertEqual(filterspec.title, 'publication decade')
         choices = list(filterspec.choices(changelist))
         self.assertEqual(choices[0]['display'], 'All')
         self.assertIs(choices[0]['selected'], True)
@@ -793,7 +792,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][1]
-        self.assertEqual(force_text(filterspec.title), 'publication decade')
+        self.assertEqual(filterspec.title, 'publication decade')
         choices = list(filterspec.choices(changelist))
         self.assertEqual(choices[1]['display'], 'the 1980\'s')
         self.assertIs(choices[1]['selected'], True)
@@ -809,7 +808,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][1]
-        self.assertEqual(force_text(filterspec.title), 'publication decade')
+        self.assertEqual(filterspec.title, 'publication decade')
         choices = list(filterspec.choices(changelist))
         self.assertEqual(choices[2]['display'], 'the 1990\'s')
         self.assertIs(choices[2]['selected'], True)
@@ -825,7 +824,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][1]
-        self.assertEqual(force_text(filterspec.title), 'publication decade')
+        self.assertEqual(filterspec.title, 'publication decade')
         choices = list(filterspec.choices(changelist))
         self.assertEqual(choices[3]['display'], 'the 2000\'s')
         self.assertIs(choices[3]['selected'], True)
@@ -841,7 +840,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choices are selected
         filterspec = changelist.get_filters(request)[0][1]
-        self.assertEqual(force_text(filterspec.title), 'publication decade')
+        self.assertEqual(filterspec.title, 'publication decade')
         choices = list(filterspec.choices(changelist))
         self.assertEqual(choices[3]['display'], 'the 2000\'s')
         self.assertIs(choices[3]['selected'], True)
@@ -851,7 +850,7 @@ class ListFiltersTests(TestCase):
         )
 
         filterspec = changelist.get_filters(request)[0][0]
-        self.assertEqual(force_text(filterspec.title), 'Verbose Author')
+        self.assertEqual(filterspec.title, 'Verbose Author')
         choice = select_by(filterspec.choices(changelist), "display", "alfred")
         self.assertIs(choice['selected'], True)
         self.assertEqual(choice['query_string'], '?author__id__exact=%s&publication-decade=the+00s' % self.alfred.pk)
@@ -903,7 +902,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         filterspec = changelist.get_filters(request)[0][0]
-        self.assertEqual(force_text(filterspec.title), 'publication decade')
+        self.assertEqual(filterspec.title, 'publication decade')
         choices = list(filterspec.choices(changelist))
         self.assertEqual(len(choices), 3)
 
@@ -932,7 +931,7 @@ class ListFiltersTests(TestCase):
         self.assertEqual(list(queryset), [self.bio_book])
 
         filterspec = changelist.get_filters(request)[0][-1]
-        self.assertEqual(force_text(filterspec.title), 'number')
+        self.assertEqual(filterspec.title, 'number')
         choices = list(filterspec.choices(changelist))
         self.assertIs(choices[2]['selected'], True)
         self.assertEqual(choices[2]['query_string'], '?no=207')
@@ -953,7 +952,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][0]
-        self.assertEqual(force_text(filterspec.title), 'publication decade')
+        self.assertEqual(filterspec.title, 'publication decade')
         choices = list(filterspec.choices(changelist))
         self.assertEqual(choices[2]['display'], 'the 1990\'s')
         self.assertIs(choices[2]['selected'], True)
@@ -970,7 +969,7 @@ class ListFiltersTests(TestCase):
 
         # Make sure the correct choice is selected
         filterspec = changelist.get_filters(request)[0][0]
-        self.assertEqual(force_text(filterspec.title), 'publication decade')
+        self.assertEqual(filterspec.title, 'publication decade')
         choices = list(filterspec.choices(changelist))
         self.assertEqual(choices[2]['display'], 'the 1990\'s')
         self.assertIs(choices[2]['selected'], True)
@@ -990,7 +989,7 @@ class ListFiltersTests(TestCase):
         self.assertEqual(list(queryset), [self.john])
 
         filterspec = changelist.get_filters(request)[0][-1]
-        self.assertEqual(force_text(filterspec.title), 'department')
+        self.assertEqual(filterspec.title, 'department')
         choices = list(filterspec.choices(changelist))
         self.assertEqual(choices[1]['display'], 'DEV')
         self.assertIs(choices[1]['selected'], True)
@@ -1010,7 +1009,7 @@ class ListFiltersTests(TestCase):
         self.assertEqual(list(queryset), [self.john])
 
         filterspec = changelist.get_filters(request)[0][-1]
-        self.assertEqual(force_text(filterspec.title), 'department')
+        self.assertEqual(filterspec.title, 'department')
         choices = list(filterspec.choices(changelist))
         self.assertEqual(choices[1]['display'], 'DEV')
         self.assertIs(choices[1]['selected'], True)
@@ -1030,7 +1029,7 @@ class ListFiltersTests(TestCase):
         self.assertEqual(list(queryset), [self.jack, self.john])
 
         filterspec = changelist.get_filters(request)[0][-1]
-        self.assertEqual(force_text(filterspec.title), 'department')
+        self.assertEqual(filterspec.title, 'department')
         choices = list(filterspec.choices(changelist))
 
         self.assertEqual(choices[0]['display'], 'All')
@@ -1055,7 +1054,7 @@ class ListFiltersTests(TestCase):
         self.assertEqual(list(queryset), [self.john])
 
         filterspec = changelist.get_filters(request)[0][-1]
-        self.assertEqual(force_text(filterspec.title), 'department')
+        self.assertEqual(filterspec.title, 'department')
         choices = list(filterspec.choices(changelist))
 
         self.assertEqual(choices[0]['display'], 'All')
@@ -1079,7 +1078,7 @@ class ListFiltersTests(TestCase):
         def _test_choices(request, expected_displays):
             changelist = self.get_changelist(request, Book, modeladmin)
             filterspec = changelist.get_filters(request)[0][0]
-            self.assertEqual(force_text(filterspec.title), 'publication decade')
+            self.assertEqual(filterspec.title, 'publication decade')
             choices = tuple(c['display'] for c in filterspec.choices(changelist))
             self.assertEqual(choices, expected_displays)