summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAron Podrigal <aronp@guaranteedplus.com>2015-01-21 22:15:59 -0500
committerSimon Charette <charette.s@gmail.com>2015-02-03 18:56:53 -0500
commit79f27f2b61aeac763ae048416ef8a97c2b639ae8 (patch)
treeaebfbc404b5155047dd75bb696d621e08d55c942 /django
parent1fc458b5a3ec002f51bcac58f09ec77493d8c8c0 (diff)
Fixed #15321 -- Honored ancestors unique checks.
Thanks to Tim for the review.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py
index f91fb3f9b6..4f00a6f0ce 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -938,7 +938,7 @@ class Model(six.with_metaclass(ModelBase)):
unique_checks = []
unique_togethers = [(self.__class__, self._meta.unique_together)]
- for parent_class in self._meta.parents.keys():
+ for parent_class in self._meta.get_parent_list():
if parent_class._meta.unique_together:
unique_togethers.append((parent_class, parent_class._meta.unique_together))
@@ -958,7 +958,7 @@ class Model(six.with_metaclass(ModelBase)):
# the list of checks.
fields_with_class = [(self.__class__, self._meta.local_fields)]
- for parent_class in self._meta.parents.keys():
+ for parent_class in self._meta.get_parent_list():
fields_with_class.append((parent_class, parent_class._meta.local_fields))
for model_class, fields in fields_with_class: