summaryrefslogtreecommitdiff
path: root/django/db
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2014-09-25 20:21:12 +0200
committerTim Graham <timograham@gmail.com>2014-09-25 17:49:44 -0400
commit45bd7b3bd9008941580c100b9fc7361e3ff3ff0d (patch)
tree2387e0e8fe6328fc31013553846dc5974a4e1e78 /django/db
parentd8e157d5ab1648a509b25d5ec571572ae936de79 (diff)
Fixed #23455 -- Forced related_name to be a unicode string during deconstruction.
Diffstat (limited to 'django/db')
-rw-r--r--django/db/models/fields/related.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index af6bf57b8a..f0b6fb5250 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -14,7 +14,7 @@ from django.db.models.lookups import IsNull
from django.db.models.related import RelatedObject, PathInfo
from django.db.models.query import QuerySet
from django.db.models.sql.datastructures import Col
-from django.utils.encoding import smart_text
+from django.utils.encoding import force_text, smart_text
from django.utils import six
from django.utils.translation import ugettext_lazy as _
from django.utils.functional import curry, cached_property
@@ -1400,7 +1400,7 @@ class ForeignObject(RelatedField):
kwargs['from_fields'] = self.from_fields
kwargs['to_fields'] = self.to_fields
if self.rel.related_name is not None:
- kwargs['related_name'] = self.rel.related_name
+ kwargs['related_name'] = force_text(self.rel.related_name)
if self.rel.related_query_name is not None:
kwargs['related_query_name'] = self.rel.related_query_name
if self.rel.on_delete != CASCADE:
@@ -2190,7 +2190,7 @@ class ManyToManyField(RelatedField):
if self.rel.db_constraint is not True:
kwargs['db_constraint'] = self.rel.db_constraint
if self.rel.related_name is not None:
- kwargs['related_name'] = self.rel.related_name
+ kwargs['related_name'] = force_text(self.rel.related_name)
if self.rel.related_query_name is not None:
kwargs['related_query_name'] = self.rel.related_query_name
# Rel needs more work.