summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2014-12-11 12:36:13 -0700
committerCarl Meyer <carl@oddbird.net>2014-12-12 12:50:39 -0700
commit8aaf51f94c70e3cfcd2c75a0be1b6f55049d82d8 (patch)
treeacc4e67eb5eda9881a6df39dda2fda93a30d5504 /django
parentdf30ae07fc7d7500bbbe51ed3361982f645169f2 (diff)
Revert "Fixed #23455 -- Forced related_name to be a unicode string during deconstruction."
This reverts commit 45bd7b3bd9008941580c100b9fc7361e3ff3ff0d.
Diffstat (limited to 'django')
-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 a3e4a1d9eb..8a6d87c5ac 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.expressions import Col
-from django.utils.encoding import force_text, smart_text
+from django.utils.encoding import smart_text
from django.utils import six
from django.utils.translation import ugettext_lazy as _
from django.utils.functional import curry, cached_property
@@ -1441,7 +1441,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'] = force_text(self.rel.related_name)
+ kwargs['related_name'] = 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:
@@ -2244,7 +2244,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'] = force_text(self.rel.related_name)
+ kwargs['related_name'] = 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.