mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

[1.7.x] Revert "Fixed #23455 -- Forced related_name to be a unicode string during deconstruction."

Browse Source 
This reverts commit 45bd7b3bd9.

This is a backport of 8aaf51f94c from master.
This commit is contained in:
Carl Meyer
2014-12-11 12:36:13 -07:00
parent c64286c62b
commit f8b4cf4022
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/fields/related.py
View File

@@ -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 force_text, smart_text
from django.utils.encoding import smart_text
from django.utils import six
from django.utils.deprecation import RenameMethodsBase, RemovedInDjango18Warning
from django.utils.translation import ugettext_lazy as _
@@ -1376,7 +1376,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:
@@ -2112,7 +2112,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.