Ticket #14531: validate_unique.patch

django/forms/models.py

@@ -202 +202 @@
         self.fields = getattr(options, 'fields', None)
         self.exclude = getattr(options, 'exclude', None)
         self.widgets = getattr(options, 'widgets', None)
+        self.validate_unique = getattr(options, 'validate_unique', None) # change to True when deprecation ends
 
 
 class ModelFormMetaclass(type):
@@ -262 +263 @@
         # if initial was provided, it should override the values from instance
         if initial is not None:
             object_data.update(initial)
-        # self._validate_unique will be set to True by BaseModelForm.clean().
-        # It is False by default so overriding self.clean() and failing to call
-        # super will stop validate_unique from being called.
-        self._validate_unique = False
         super(BaseModelForm, self).__init__(data, files, auto_id, prefix, object_data,
                                             error_class, label_suffix, empty_permitted)
 
@@ -323 +320 @@
         return exclude
 
     def clean(self):
-        self._validate_unique = True
+        opts = self._meta
+        if opts.validate_unique is None:
+            opts.validate_unique = True
         return self.cleaned_data
 
     def _post_clean(self):
@@ -357 +356 @@
             self._update_errors({NON_FIELD_ERRORS: e.messages})
 
         # Validate uniqueness if needed.
-        if self._validate_unique:
+        if opts.validate_unique:
             self.validate_unique()
+        elif opts.validate_unique is None:
+            raise PendingDeprecationWarning('?')
 
     def validate_unique(self):
         """