Ticket #18063: 18063-no-unicode-repr.diff

django/db/models/base.py

@@ -23 +23 @@
 from django.db.models.loading import register_models, get_model
 from django.utils.translation import ugettext_lazy as _
 from django.utils.functional import curry
-from django.utils.encoding import smart_str, force_text
+from django.utils.encoding import smart_text, force_text
 from django.utils import six
 from django.utils.text import get_text_list, capfirst
 
@@ -404 +404 @@
             u = six.text_type(self)
         except (UnicodeEncodeError, UnicodeDecodeError):
             u = '[Bad Unicode data]'
-        return smart_str('<%s: %s>' % (self.__class__.__name__, u))
+        if not six.PY3:
+            u = u.encode('ascii', 'replace')
+        return smart_text('<%s: %s>' % (self.__class__.__name__, u))
 
     def __str__(self):
         if not six.PY3 and hasattr(self, '__unicode__'):

tests/regressiontests/model_regress/tests.py

@@ +1 @@
+# coding: utf-8
+
 from __future__ import absolute_import, unicode_literals
 
 import datetime
@@ -146 +148 @@
         b = BrokenUnicodeMethod.objects.create(name="Jerry")
         self.assertEqual(repr(b), "<BrokenUnicodeMethod: [Bad Unicode data]>")
 
+    def test_no_unicode_in_repr(self):
+        a = Article.objects.create(
+            headline="Watch for umlauts: üöä", pub_date=datetime.datetime.now())
+        if six.PY3:
+            self.assertEqual(repr(a), '<Article: Watch for umlauts: üöä>')
+        else:
+            self.assertEqual(repr(a), '<Article: Watch for umlauts: ???>')
+
     @skipUnlessDBFeature("supports_timezones")
     def test_timezones(self):
         # Saving an updating with timezone-aware datetime Python objects.