From 394807866de4b9841ec67e0c28e53d49964629ce Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Sat, 1 Dec 2007 16:50:48 +0000 Subject: [PATCH] Simplified the newforms error_messages setting code from [6625] git-svn-id: http://code.djangoproject.com/svn/django/trunk@6785 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/newforms/fields.py | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/django/newforms/fields.py b/django/newforms/fields.py index 4a54a98d61..845fb3519a 100644 --- a/django/newforms/fields.py +++ b/django/newforms/fields.py @@ -83,21 +83,15 @@ class Field(object): 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): """