Ticket #5353: 5353-BaseFormSet.clean.patch

django/newforms/formsets.py

@@ -93 +93 @@
     forms = property(_forms)
 
     def full_clean(self):
-        """Cleans all of self.data and populates self.__errors and self.cleaned_data."""
+        """Cleans all of self.data and populates self._is_valid and self.non_form_errors if applicable."""
         is_valid = True
-        errors = []
+        self.non_form_errors = []
         if not self.is_bound: # Stop further processing.
-            self.__errors = errors
             return
-        cleaned_data = []
-        deleted_data = []
         
         # Process change forms
         for form in self.change_forms:
-            if form.is_valid():
-                if self.deletable and form.cleaned_data[DELETION_FIELD_NAME]:
-                    deleted_data.append(form.cleaned_data)
-                else:
-                    cleaned_data.append(form.cleaned_data)
-            else:
+            if not form.is_valid():
                 is_valid = False
-            errors.append(form.errors)
         
         # Process add forms in reverse so we can easily tell when the remaining
         # ones should be required.
         required = False
-        add_errors = []
         for i in range(len(self.add_forms)-1, -1, -1):
             form = self.add_forms[i]
             # If an add form is empty, reset it so it won't have any errors
             if form.is_empty([ORDERING_FIELD_NAME]) and not required:
                 form.reset()
-                continue
             else:
                 required = True
-                if form.is_valid():
-                    cleaned_data.append(form.cleaned_data)
-                else:
+                if not form.is_valid():
                     is_valid = False
-            add_errors.append(form.errors)
-        add_errors.reverse()
-        errors.extend(add_errors)
 
-        if self.orderable:
-            cleaned_data.sort(lambda x,y: x[ORDERING_FIELD_NAME] - y[ORDERING_FIELD_NAME])
+        try:
+            self.clean()
+        except ValidationError, e:
+            self.non_form_errors.extend(e.messages)
+            is_valid = False
 
-        if is_valid:
-            self.cleaned_data = cleaned_data
-            self.deleted_data = deleted_data
-        self.errors = errors
         self._is_valid = is_valid
 
+    def has_errors(self):
+        return not self.is_valid()
+
+    def clean(self):
+        pass
+
     def add_fields(self, form, index):
         """A hook for adding extra fields on to each form instance."""
         if self.orderable: