Ticket #6737: forms-error-messages.patch

django/newforms/fields.py

@@ -19 +19 @@
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import StrAndUnicode, smart_unicode, smart_str
 
-from util import ErrorList, ValidationError
+from util import ErrorList, ValidationError, build_class_error_messages
 from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateTimeInput
 
 
@@ -83 +83 @@
         self.creation_counter = Field.creation_counter
         Field.creation_counter += 1
 
-        def set_class_error_messages(messages, klass):
-            for base_class in klass.__bases__:
-                set_class_error_messages(messages, base_class)
-            messages.update(getattr(klass, 'default_error_messages', {}))
-
-        messages = {}
-        set_class_error_messages(messages, self.__class__)
-        messages.update(error_messages or {})
-        self.error_messages = messages
+        self.error_messages = build_class_error_messages(self.__class__,
+            error_messages)
 
     def clean(self, value):
         """

django/newforms/forms.py

@@ -12 +12 @@
 from fields import Field, FileField
 from widgets import TextInput, Textarea
 from util import flatatt, ErrorDict, ErrorList, ValidationError
+from util import build_class_error_messages
 
 __all__ = ('BaseForm', 'Form')
 
@@ -64 +65 @@
     # information. Any improvements to the form API should be made to *this*
     # class, not to the Form class.
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
-                 initial=None, error_class=ErrorList, label_suffix=':'):
+                 initial=None, error_class=ErrorList, label_suffix=':',
+                 error_messages=None):
         self.is_bound = data is not None or files is not None
         self.data = data or {}
         self.files = files or {}
@@ -81 +83 @@
         # Instances should always modify self.fields; they should not modify
         # self.base_fields.
         self.fields = deepcopy(self.base_fields)
+
+        self.error_messages = build_class_error_messages(self.__class__,
+            error_messages)
 
     def __unicode__(self):
         return self.as_table()

django/newforms/util.py

@@ -67 +67 @@
         # AttributeError: ValidationError instance has no attribute 'args'
         # See http://www.python.org/doc/current/tut/node10.html#handling
         return repr(self.messages)
+
+def build_class_error_messages(klass, error_messages):
+    """
+    Builds a dict of error messages from the ``default_error_messages``
+    attributes of the given class, and all base classes.
+    """
+    def set_class_error_messages(messages, klass):
+        for base_class in klass.__bases__:
+            set_class_error_messages(messages, base_class)
+        messages.update(getattr(klass, 'default_error_messages', {}))
+
+    messages = {}
+    set_class_error_messages(messages, klass)
+    messages.update(error_messages or {})
+    return messages