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

tests/regressiontests/model_regress/tests.py

@@ +1 @@
+# coding: utf-8
 from __future__ import absolute_import
 
 import datetime
@@ -145 +146 @@
         # Models with broken unicode methods should still have a printable repr
         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=u"Watch for umlauts: üöä", pub_date=datetime.datetime.now())
+        self.assertEqual(repr(a), '<Article: Watch for umlauts: ???>')
+        
     @skipUnlessDBFeature("supports_timezones")
     def test_timezones(self):
         # Saving an updating with timezone-aware datetime Python objects.

django/db/models/base.py

@@ -373 +373 @@
             u = unicode(self)
         except (UnicodeEncodeError, UnicodeDecodeError):
             u = '[Bad Unicode data]'
-        return smart_str(u'<%s: %s>' % (self.__class__.__name__, u))
+        return smart_str(u'<%s: %s>' % (self.__class__.__name__, u.encode('ascii', 'replace')))
 
     def __str__(self):
         if hasattr(self, '__unicode__'):