Author: adrian
Date: 2007-12-01 10:50:48 -0600 (Sat, 01 Dec 2007)
New Revision: 6785
Modified:
django/trunk/django/newforms/fields.py
Log:
Simplified the newforms error_messages setting code from [6625]
Modified: django/trunk/django/newforms/fields.py
===================================================================
--- django/trunk/django/newforms/fields.py 2007-12-01 16:39:28 UTC (rev
6784)
+++ django/trunk/django/newforms/fields.py 2007-12-01 16:50:48 UTC (rev
6785)
@@ -83,21 +83,15 @@
self.creation_counter = Field.creation_counter
Field.creation_counter += 1
- self.error_messages = self._build_error_messages(error_messages)
-
- def _build_error_messages(self, extra_error_messages):
- error_messages = {}
-
- def get_default_error_messages(klass):
+ def set_class_error_messages(messages, klass):
for base_class in klass.__bases__:
- get_default_error_messages(base_class)
- if hasattr(klass, 'default_error_messages'):
- error_messages.update(klass.default_error_messages)
+ set_class_error_messages(messages, base_class)
+ messages.update(getattr(klass, 'default_error_messages', {}))
- get_default_error_messages(self.__class__)
- if extra_error_messages:
- error_messages.update(extra_error_messages)
- return error_messages
+ messages = {}
+ set_class_error_messages(messages, self.__class__)
+ messages.update(error_messages or {})
+ self.error_messages = messages
def clean(self, value):
"""
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
