Ticket #6138: error_class_and_tests.diff

django/forms/forms.py

@@ -13 +13 @@
 from widgets import Media, media_property, TextInput, Textarea
 from util import flatatt, ErrorDict, ErrorList, ValidationError
 
-__all__ = ('BaseForm', 'Form')
+__all__ = ('BaseForm', 'Form', 'NON_FIELD_ERRORS')
 
 NON_FIELD_ERRORS = '__all__'
 
@@ -243 +243 @@
                     value = getattr(self, 'clean_%s' % name)()
                     self.cleaned_data[name] = value
             except ValidationError, e:
-                self._errors[name] = e.messages
+                self._errors[name] = self.error_class(e.messages)
                 if name in self.cleaned_data:
                     del self.cleaned_data[name]
         try:
             self.cleaned_data = self.clean()
         except ValidationError, e:
-            self._errors[NON_FIELD_ERRORS] = e.messages
+            self._errors[NON_FIELD_ERRORS] = self.error_class(e.messages)
         if self._errors:
             delattr(self, 'cleaned_data')
 

django/forms/formsets.py

@@ -252 +252 @@
         try:
             self.clean()
         except ValidationError, e:
-            self._non_form_errors = e.messages
+            self._non_form_errors = self.error_class(e.messages)
 
     def clean(self):
         """

tests/regressiontests/forms/error_messages.py

@@ -358 +358 @@
 Traceback (most recent call last):
 ...
 ValidationError: [u'4 IS INVALID CHOICE']
+
+#Custom error_class and form using it
+>>> from django.forms import *
+>>> from django.forms.util import ErrorList
+>>> class ErrList(list):
+...    def __unicode__(self):
+...        return u"<div>%s</div>" % ', '.join([unicode(msg) for msg in self])
+>>> class ValidationTest(Form):
+...     first_name = CharField(required=True)
+...     def clean(self):
+...         raise ValidationError, "Never correct"
+        
+#Instance with missing field using custom class
+>>> vt = ValidationTest(error_class=ErrList, data={})
+>>> vt.errors[NON_FIELD_ERRORS].__unicode__()
+u'<div>Never correct</div>'
+>>> vt.errors['first_name'].__unicode__()
+u'<div>This field is required.</div>'
 """