summaryrefslogtreecommitdiff
path: root/django/db/models
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:09:53 -0400
commit216580e03499e035b93283df00fcc03b346fef7b (patch)
tree4206c15096f5a98e79a2b34bd2c6aff6ae0a79d4 /django/db/models
parenta49e7dd2a34882fc68244e024eb2876b21c7e8a8 (diff)
Fixed #20207 -- Handle ManyToManyField with a unicode name correctly.
Diffstat (limited to 'django/db/models')
-rw-r--r--django/db/models/fields/related.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index 677a4707a0..e85b3301bf 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -1327,7 +1327,7 @@ def create_many_to_many_intermediary_model(field, klass):
'verbose_name_plural': '%(from)s-%(to)s relationships' % {'from': from_, 'to': to},
})
# Construct and return the new class.
- return type(name, (models.Model,), {
+ return type(str(name), (models.Model,), {
'Meta': meta,
'__module__': klass.__module__,
from_: models.ForeignKey(klass, related_name='%s+' % name, db_tablespace=field.db_tablespace, db_constraint=field.rel.db_constraint),