diff options
| author | Claude Paroz <claude@2xlibre.net> | 2016-11-19 21:54:19 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2017-01-18 13:44:34 +0100 |
| commit | f3c43ad1fd9556f0fd026a5dfa93c67a5cf186ca (patch) | |
| tree | 65ca40d4527b377845cdd382456383bf97caafa6 /tests/str | |
| parent | d7b9aaa366dd54ecc3142c588162e3adc7c2f7ac (diff) | |
Refs #23919 -- Removed python_2_unicode_compatible decorator usage
Diffstat (limited to 'tests/str')
| -rw-r--r-- | tests/str/models.py | 2 | ||||
| -rw-r--r-- | tests/str/tests.py | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/tests/str/models.py b/tests/str/models.py index 33e31857fa..12f0247570 100644 --- a/tests/str/models.py +++ b/tests/str/models.py @@ -14,7 +14,6 @@ if you prefer. You must be careful to encode the results correctly, though. """ from django.db import models -from django.utils.encoding import python_2_unicode_compatible class Article(models.Model): @@ -27,7 +26,6 @@ class Article(models.Model): return self.headline -@python_2_unicode_compatible class InternationalArticle(models.Model): headline = models.CharField(max_length=100) pub_date = models.DateTimeField() diff --git a/tests/str/tests.py b/tests/str/tests.py index 516560415c..c4dd1d6b26 100644 --- a/tests/str/tests.py +++ b/tests/str/tests.py @@ -25,13 +25,7 @@ class SimpleTests(TestCase): headline='Girl wins €12.500 in lottery', pub_date=datetime.datetime(2005, 7, 28) ) - if six.PY3: - self.assertEqual(str(a), 'Girl wins €12.500 in lottery') - else: - # On Python 2, the default str() output will be the UTF-8 encoded - # output of __unicode__() -- or __str__() when the - # python_2_unicode_compatible decorator is used. - self.assertEqual(str(a), b'Girl wins \xe2\x82\xac12.500 in lottery') + self.assertEqual(str(a), 'Girl wins €12.500 in lottery') @isolate_apps('str') def test_defaults(self): |