summaryrefslogtreecommitdiff
path: root/tests/admin_utils/test_logentry.py
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/admin_utils/test_logentry.py
parentf6acd1d271122d66de8061e75ae26137ddf02658 (diff)
Refs #23919 -- Removed six.<various>_types usage
Thanks Tim Graham and Simon Charette for the reviews.
Diffstat (limited to 'tests/admin_utils/test_logentry.py')
-rw-r--r--tests/admin_utils/test_logentry.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/admin_utils/test_logentry.py b/tests/admin_utils/test_logentry.py
index 89b25f462b..c2eee96f48 100644
--- a/tests/admin_utils/test_logentry.py
+++ b/tests/admin_utils/test_logentry.py
@@ -7,7 +7,7 @@ from django.contrib.auth.models import User
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase, override_settings
from django.urls import reverse
-from django.utils import six, translation
+from django.utils import translation
from django.utils.encoding import force_bytes
from django.utils.html import escape
@@ -164,17 +164,17 @@ class LogEntryTests(TestCase):
log_entry = LogEntry()
log_entry.action_flag = ADDITION
- self.assertTrue(six.text_type(log_entry).startswith('Added '))
+ self.assertTrue(str(log_entry).startswith('Added '))
log_entry.action_flag = CHANGE
- self.assertTrue(six.text_type(log_entry).startswith('Changed '))
+ self.assertTrue(str(log_entry).startswith('Changed '))
log_entry.action_flag = DELETION
- self.assertTrue(six.text_type(log_entry).startswith('Deleted '))
+ self.assertTrue(str(log_entry).startswith('Deleted '))
# Make sure custom action_flags works
log_entry.action_flag = 4
- self.assertEqual(six.text_type(log_entry), 'LogEntry Object')
+ self.assertEqual(str(log_entry), 'LogEntry Object')
def test_log_action(self):
content_type_pk = ContentType.objects.get_for_model(Article).pk