1
0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00

Refs #26521 -- Added the duplicated value to CreateModel validation messages.

Thanks Tim for the suggestion.
This commit is contained in:
Simon Charette
2016-04-27 16:17:22 -04:00
parent fed7004b8a
commit a877a2f83d
2 changed files with 18 additions and 16 deletions

View File

@@ -17,7 +17,7 @@ def _check_for_duplicates(arg_name, objs):
for val in objs:
if val in used_vals:
raise ValueError(
'Found duplicate %s in CreateModel operation.' % arg_name
"Found duplicate value %s in CreateModel %s argument." % (val, arg_name)
)
used_vals.add(val)
@@ -55,14 +55,14 @@ class CreateModel(ModelOperation):
super(CreateModel, self).__init__(name)
# Sanity-check that there are no duplicated field names, bases, or
# manager names
_check_for_duplicates("field", (name for name, _ in self.fields))
_check_for_duplicates('fields', (name for name, _ in self.fields))
_check_for_duplicates(
"base",
'bases',
(base._meta.label_lower if isinstance(base, models.base.ModelBase) else base.lower()
for base in self.bases
if base is not models.Model)
)
_check_for_duplicates("manager", (name for name, _ in self.managers))
_check_for_duplicates('managers', (name for name, _ in self.managers))
def deconstruct(self):
kwargs = {