summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2013-04-05 13:59:15 -0400
committerSimon Charette <charette.s@gmail.com>2013-04-05 15:21:59 -0400
commitd04e8f8c7869b79a6f848a94bd51ce71223c2df2 (patch)
treeccaac61061c0a5e400e01836fafb1aa8e3144431 /tests
parenta15a3e9148e9707f8ab3477be512546e7cf73607 (diff)
[1.5.x] Fixed #20207 -- Handle ManyToManyField with a unicode name correctly.
Backport of 216580e034.
Diffstat (limited to 'tests')
-rw-r--r--tests/modeltests/many_to_many/models.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/modeltests/many_to_many/models.py b/tests/modeltests/many_to_many/models.py
index a196c85092..31793b3974 100644
--- a/tests/modeltests/many_to_many/models.py
+++ b/tests/modeltests/many_to_many/models.py
@@ -6,6 +6,7 @@ To define a many-to-many relationship, use ``ManyToManyField()``.
In this example, an ``Article`` can be published in multiple ``Publication``
objects, and a ``Publication`` has multiple ``Article`` objects.
"""
+from __future__ import unicode_literals
from django.db import models
from django.utils.encoding import python_2_unicode_compatible
@@ -24,7 +25,9 @@ class Publication(models.Model):
@python_2_unicode_compatible
class Article(models.Model):
headline = models.CharField(max_length=100)
- publications = models.ManyToManyField(Publication)
+ # Assign a unicode string as name to make sure the intermediary model is
+ # correctly created. Refs #20207
+ publications = models.ManyToManyField(Publication, name='publications')
def __str__(self):
return self.headline