Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #9608: Ensured a Model's default repr() is printable even if it…

…s __unicode__ method raises a Unicode error.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 8e350d036ce6e12b2c2e9229c6b00d4da7823ffb 1 parent bcb4693
@kmtracey kmtracey authored
View
6 django/db/models/base.py
@@ -266,7 +266,11 @@ def __init__(self, *args, **kwargs):
signals.post_init.send(sender=self.__class__, instance=self)
def __repr__(self):
- return smart_str(u'<%s: %s>' % (self.__class__.__name__, unicode(self)))
+ try:
+ u = unicode(self)
+ except (UnicodeEncodeError, UnicodeDecodeError):
+ u = '[Bad Unicode data]'
+ return smart_str(u'<%s: %s>' % (self.__class__.__name__, u))
def __str__(self):
if hasattr(self, '__unicode__'):
View
12 tests/regressiontests/model_regress/models.py
@@ -46,6 +46,12 @@ class Worker(models.Model):
def __unicode__(self):
return self.name
+class BrokenUnicodeMethod(models.Model):
+ name = models.CharField(max_length=7)
+ def __unicode__(self):
+ return 'Názov: %s' % self.name
+
+
__test__ = {'API_TESTS': """
(NOTE: Part of the regression test here is merely parsing the model
declaration. The verbose_name, in particular, did not always work.)
@@ -128,5 +134,11 @@ def __unicode__(self):
>>> w
<Worker: Full-time>
+# Models with broken unicode methods should still have a printable repr
+>>> b = BrokenUnicodeMethod(name="Jerry")
+>>> b.save()
+>>> BrokenUnicodeMethod.objects.all()
+[<BrokenUnicodeMethod: [Bad Unicode data]>]
+
"""
}
Please sign in to comment.
Something went wrong with that request. Please try again.