Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

[py3] Fixed the str tests.

These tests don't look very meaningful. They were ported from
  • Loading branch information...
commit e98cb05edf87eebf939a680066822c16f1257f44 1 parent 71d07fb
@aaugustin aaugustin authored
Showing with 13 additions and 4 deletions.
  1. +13 −4 tests/modeltests/str/
17 tests/modeltests/str/
@@ -4,23 +4,32 @@
import datetime
from django.test import TestCase
+from django.utils import six
+from django.utils.unittest import skipIf
from .models import Article, InternationalArticle
class SimpleTests(TestCase):
+ @skipIf(six.PY3, "tests a __str__ method returning unicode under Python 2")
def test_basic(self):
a = Article.objects.create(
headline=b'Area man programs in Python',
pub_date=datetime.datetime(2005, 7, 28)
- self.assertEqual(str(a), b'Area man programs in Python')
- self.assertEqual(repr(a), b'<Article: Area man programs in Python>')
+ self.assertEqual(str(a), str('Area man programs in Python'))
+ self.assertEqual(repr(a), str('<Article: Area man programs in Python>'))
def test_international(self):
a = InternationalArticle.objects.create(
headline='Girl wins €12.500 in lottery',
pub_date=datetime.datetime(2005, 7, 28)
- # The default str() output will be the UTF-8 encoded output of __unicode__().
- self.assertEqual(str(a), b'Girl wins \xe2\x82\xac12.500 in lottery')
+ 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')

0 comments on commit e98cb05

Please sign in to comment.
Something went wrong with that request. Please try again.