@@ -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__'): django/db/models/base.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 @@ 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]>] + """ } tests/regressiontests/model_regress/models.py 0389d5bf1c9e664c59ceb6b57b5b0c294ee1049c kmtracey kmtracey@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/dcramer/django-compositepks/commit/9ecc2bd086f419a87039257a11aa26f69449340a 9ecc2bd086f419a87039257a11aa26f69449340a 2008-11-16T10:58:43-08:00 2008-11-16T10:58:43-08:00 Fixed #9608: Ensured a Model's default repr() is printable even if its __unicode__ method raises a Unicode error. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9475 bcc190cf-cafb-0310-a4f2-bffc1f526a37 5d51dead0070fa62e38c9fa211894338828e3c12 kmtracey kmtracey@bcc190cf-cafb-0310-a4f2-bffc1f526a37