[soc2009/model-validation] Moved ValidationError to django.core.exceptions and removed ErrorList from within the Error

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@10867 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 18 insertions, 1 deletions

diff --git a/django/core/exceptions.py b/django/core/exceptions.py
index 1c21031739..2fe384e6dd 100644
--- a/django/core/exceptions.py
+++ b/django/core/exceptions.py
@@ -34,4 +34,21 @@ class FieldError(Exception):
 
 class ValidationError(Exception):
     """An error while validating data."""
-    pass
+    def __init__(self, message):
+        from django.utils.encoding import force_unicode
+        """
+        ValidationError can be passed any object that can be printed (usually
+        a string) or a list of objects.
+        """
+        if isinstance(message, list):
+            self.messages = [force_unicode(msg) for msg in message]
+        else:
+            message = force_unicode(message)
+            self.messages = [message]
+
+    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
+        return repr(self.messages)