Ticket #16986: model-clean-errordict-2.diff

django/forms/models.py

@@ -330 +330 @@
         try:
             self.instance.clean()
         except ValidationError, e:
-            self._update_errors({NON_FIELD_ERRORS: e.messages})
+            if e.has_message_dict:
+                self._update_errors(e.message_dict)
+            else:
+                self._update_errors({NON_FIELD_ERRORS: e.messages})
 
         # Validate uniqueness if needed.
         if self._validate_unique:

django/core/exceptions.py

@@ -59 +59 @@
             self.params = params
             message = force_unicode(message)
             self.messages = [message]
-
+    
+    @property
+    def has_message_dict(self):
+        return hasattr(self, 'message_dict')
+    
     def __str__(self):
         # This is needed because, without a __str__(), printing an exception
         # instance would result in this:
         # AttributeError: ValidationError instance has no attribute 'args'
         # See http://www.python.org/doc/current/tut/node10.html#handling
-        if hasattr(self, 'message_dict'):
+        if self.has_message_dict:
             return repr(self.message_dict)
         return repr(self.messages)
 
     def __repr__(self):
-        if hasattr(self, 'message_dict'):
+        if self.has_message_dict:
             return 'ValidationError(%s)' % repr(self.message_dict)
         return 'ValidationError(%s)' % repr(self.messages)
 
     def update_error_dict(self, error_dict):
-        if hasattr(self, 'message_dict'):
+        if self.has_message_dict:
             if error_dict:
                 for k, v in self.message_dict.items():
                     error_dict.setdefault(k, []).extend(v)