Ticket #6045: 6045.solution_and_test.patch

django/db/models/fields/related.py

@@ -8 +8 @@
 from django.db.models.query import QuerySet
 from django.db.models.query_utils import QueryWrapper
 from django.db.models.deletion import CASCADE
-from django.utils.encoding import smart_unicode
+from django.utils.encoding import smart_unicode, smart_str
 from django.utils.translation import (ugettext_lazy as _, string_concat,
     ungettext, ugettext)
 from django.utils.functional import curry
@@ -1005 +1005 @@
             assert not to._meta.abstract, "%s cannot define a relation with abstract class %s" % (self.__class__.__name__, to._meta.object_name)
         except AttributeError: # to._meta doesn't exist, so it must be RECURSIVE_RELATIONSHIP_CONSTANT
             assert isinstance(to, basestring), "%s(%r) is invalid. First parameter to ManyToManyField must be either a model, a model name, or the string %r" % (self.__class__.__name__, to, RECURSIVE_RELATIONSHIP_CONSTANT)
+            to = smart_str(to,encoding='ascii') # normalize unicode strings to ascii as it is the only acceptable encoding for getattr
 
         kwargs['verbose_name'] = kwargs.get('verbose_name', None)
         kwargs['rel'] = ManyToManyRel(to,

tests/modeltests/m2m_and_m2o/tests.py

@@ -2 +2 @@
 from django.test import TestCase
 
 from models import Issue, User
+from models import UnicodeReferenceModel
 
 
 class RelatedObjectTests(TestCase):
@@ -73 +74 @@
             ],
             lambda i: i.num
         )
+
+
+
+class RelatedObjectTests(TestCase):
+    def test_m2m_with_unicode_reference(self):
+        m1=UnicodeReferenceModel()
+        m1.save()
+        m2=UnicodeReferenceModel()
+        m2.save() # create a PK so you can use m2m
+        m2.others.add(m1) # used to cause an error (see ticket #6045)
+        m2.save()
+        for i in m2.others.all():
+            pass # force retrieving.

tests/modeltests/m2m_and_m2o/models.py

@@ -19 +19 @@
 
     class Meta:
         ordering = ('num',)
+
+
+class UnicodeReferenceModel(models.Model):
+    others = models.ManyToManyField(u"UnicodeReferenceModel")
+ No newline at end of file