p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #25560 -- Made empty string related_name invalid. 

Thanks to Ali Lotfi for the initial report and patch
and Tim Graham for the review.
This commit is contained in:
Simon Charette 2015-10-16 12:21:30 -04:00
parent 4dcc2a1955
commit c1b6a8a98b
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@ class RelatedField(Field):
import re import re
import keyword import keyword
related_name = self.remote_field.related_name related_name = self.remote_field.related_name
if not related_name: if related_name is None:
return [] return []
is_valid_id = True is_valid_id = True
if keyword.iskeyword(related_name): if keyword.iskeyword(related_name):

2
django/db/models/fields/reverse_related.py
View File

@ -154,7 +154,7 @@ class ForeignObjectRel(object):
def is_hidden(self): def is_hidden(self):
"Should the related object be hidden?" "Should the related object be hidden?"
return self.related_name is not None and self.related_name[-1] == '+' return bool(self.related_name) and self.related_name[-1] == '+'
def get_joining_columns(self): def get_joining_columns(self):
return self.field.get_reverse_joining_columns() return self.field.get_reverse_joining_columns()

1
tests/invalid_models_tests/test_relative_fields.py
View File

@ -662,6 +662,7 @@ class RelativeFieldTests(IsolatedModelsTestCase):
'ends_with_whitespace_%s' % whitespace, 'ends_with_whitespace_%s' % whitespace,
'with', # a Python keyword 'with', # a Python keyword
'related_name\n', 'related_name\n',
'',
] ]
# Python 2 crashes on non-ASCII strings. # Python 2 crashes on non-ASCII strings.
if six.PY3: if six.PY3: