Ticket #12483: 12483.diff

django/db/models/base.py

@@ -371 +371 @@
             u = unicode(self)
         except (UnicodeEncodeError, UnicodeDecodeError):
             u = '[Bad Unicode data]'
+        except TypeError, e:
+            raise TypeError("%s: %s" % (self.__class__, e))
         return smart_str(u'<%s: %s>' % (self.__class__.__name__, u))
 
     def __str__(self):

tests/regressiontests/model_regress/models.py

@@ -57 +57 @@
 
 class NonAutoPK(models.Model):
     name = models.CharField(max_length=10, primary_key=True)
+
+class NoneUnicodeMethod(models.Model):
+    def __unicode__(self):
+        # Intentionally broken. Returns None
+        return None

tests/regressiontests/model_regress/tests.py

@@ -6 +6 @@
 from django.utils import tzinfo
 
 from models import (Worker, Article, Party, Event, Department,
-    BrokenUnicodeMethod, NonAutoPK)
+    BrokenUnicodeMethod, NonAutoPK, NoneUnicodeMethod)
 
 
 
@@ -145 +145 @@
         b = BrokenUnicodeMethod.objects.create(name="Jerry")
         self.assertEqual(repr(b), "<BrokenUnicodeMethod: [Bad Unicode data]>")
 
+        n = NoneUnicodeMethod()
+        self.assertRaises(TypeError, lambda: unicode(n))
+        self.assertRaisesRegexp(
+            TypeError,
+            "<class 'regressiontests.model_regress.models.NoneUnicodeMethod'>: coercing to Unicode: need string or buffer, NoneType found",
+            lambda: repr(NoneUnicodeMethod())
+            )
+
     @skipUnlessDBFeature("supports_timezones")
     def test_timezones(self):
         # Saving an updating with timezone-aware datetime Python objects.