Changeset 9475

Timestamp:

11/16/08 12:58:43 (2 months ago)

Author:

kmtracey

Message:

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

Files:

• django/trunk/django/db/models/base.py (modified) (1 diff)
• django/trunk/tests/regressiontests/model_regress/models.py (modified) (2 diffs)

django/trunk/django/db/models/base.py

@@ -267 +267 @@
-
-    def __repr__(self):
-
+
+
+
+
+
-
-    def __str__(self):

django/trunk/tests/regressiontests/model_regress/models.py

@@ -46 +46 @@
-    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': """
@@ -129 +135 @@
-<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]>]
+
-"""
-}