Ticket #12698: r12344_ticket12698.diff

django/forms/models.py

@@ -306 +306 @@
         try:
             self.instance.clean_fields(exclude=exclude)
         except ValidationError, e:
-            self._update_errors(e.message_dict)
+            if hasattr(e, 'message_dict'):
+                self._update_errors(e.message_dict)
+            else:
+                self._update_errors({NON_FIELD_ERRORS: e.messages})
 
     def _clean_form(self):
         """
@@ -317 +320 @@
         try:
             self.instance.clean()
         except ValidationError, e:
-            self._update_errors(e.message_dict)
+            if hasattr(e, 'message_dict'):
+                self._update_errors(e.message_dict)
+            else:
+                self._update_errors({NON_FIELD_ERRORS: e.messages})
         super(BaseModelForm, self)._clean_form()
 
     def validate_unique(self):
@@ -329 +335 @@
         try:
             self.instance.validate_unique(exclude=exclude)
         except ValidationError, e:
-            self._update_errors(e.message_dict)
+            if hasattr(e, 'message_dict'):
+                self._update_errors(e.message_dict)
+            else:
+                self._update_errors({NON_FIELD_ERRORS: e.messages})
 
     def save(self, commit=True):
         """