summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAron Podrigal <aronp@guaranteedplus.com>2015-01-30 04:40:25 -0500
committerTim Graham <timograham@gmail.com>2015-02-09 08:43:40 -0500
commiteb9fbc0b1d6497f20204d9032852a5b4ae8b2466 (patch)
tree8ddde42e0143940f75f7bc035a4a9b14d673e7f9 /django
parent8cb2cfdda5a9a913dc761eba48b56b7d2f4ce2e7 (diff)
[1.8.x] Fixed #24249 -- Improved field shadowing validation in model multi-inheritance.
Backport of 4d73303ee974c5f1ea6af984d4578d817825026d from master
Diffstat (limited to 'django')
-rw-r--r--django/db/models/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py
index 7bc726a617..f95c182566 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -1308,7 +1308,7 @@ class Model(six.with_metaclass(ModelBase)):
used_fields = {} # name or attname -> field
# Check that multi-inheritance doesn't cause field name shadowing.
- for parent in cls._meta.parents:
+ for parent in cls._meta.get_parent_list():
for f in parent._meta.local_fields:
clash = used_fields.get(f.name) or used_fields.get(f.attname) or None
if clash: