Commit bdae3cc2 authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.0.X] Fixed #9608: Ensured a Model's default repr() is printable even if its...

[1.0.X] Fixed #9608: Ensured a Model's default repr() is printable even if its unicode method raises a Unicode error.

r9475 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 5adf72e3
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -266,7 +266,11 @@ class Model(object):
        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__'):
+12 −0
Original line number Diff line number Diff line
@@ -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 @@ datetime.datetime(2000, 1, 1, 6, 1, 1)
>>> 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]>]

"""
}