Ticket #6045: test_for_6045_worksforme.diff

tests/regressiontests/m2m_regress/tests.py

@@ -2 +2 @@
 from django.test import TestCase
 
 from models import (SelfRefer, Tag, TagCollection, Entry, SelfReferChild,
-    SelfReferChildSibling, Worksheet)
+    SelfReferChildSibling, Worksheet, Story, Life)
 
 
 class M2MRegressionTests(TestCase):
@@ -73 +73 @@
 
         self.assertQuerysetEqual(c1.tags.all(), ["<Tag: t1>", "<Tag: t2>"])
         self.assertQuerysetEqual(t1.tag_collections.all(), ["<TagCollection: c1>"])
+
+    def test_m2m_unicode(self):
+        # Regression for #6045 - You can an Unicode string as first argument
+        # or as related_name in a ManyToManyField
+
+        s = Story.objects.create(name='birth of Fred')
+        s.save()
+
+        l = Life.objects.create(name='mother of Fred')
+        l.stories = [s]
+        l.save()
+
+        l = Life.objects.create(name='father of Fred')
+        l.stories = [s]
+        l.save()
+
+        self.assertQuerysetEqual(l.stories.all(), ["<Story: birth of Fred>"])
+        self.assertQuerysetEqual(s.witnesses.all(), ["<Life: mother of Fred>",
+                                                     "<Life: father of Fred>"])

tests/regressiontests/m2m_regress/models.py

@@ -56 +56 @@
 class User(models.Model):
     name = models.CharField(max_length=30)
     friends = models.ManyToManyField(auth.User)
+
+# Regression for #6045 - A model with ManyToManyField whose first argument 
+# or whose related_name is an Unicode string
+class Story(models.Model):
+    name = models.CharField(max_length=100)
+
+    def __unicode__(self):
+        return self.name
+
+class Life(models.Model):
+    name = models.CharField(max_length=100)
+    stories = models.ManyToManyField(u'Story', related_name=u'witnesses')
+
+    def __unicode__(self):
+        return self.name