1
0
mirror of https://github.com/django/django.git synced 2025-07-07 11:19:12 +00:00

[soc2009/model-validation] changed error_message creation to use __mro__ instead of recursive function.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@11184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Honza Král 2009-07-05 13:26:31 +00:00
parent 69b4f2ea2e
commit 8424c8ae6c

View File

@ -101,15 +101,12 @@ class Field(object):
self.creation_counter = Field.creation_counter self.creation_counter = Field.creation_counter
Field.creation_counter += 1 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 = {} messages = {}
set_class_error_messages(messages, self.__class__) for c in reversed(self.__class__.__mro__):
messages.update(getattr(c, 'default_error_messages', {}))
messages.update(error_messages or {}) messages.update(error_messages or {})
self.error_messages = messages self.error_messages = messages
self.validators = self.default_validators + validators self.validators = self.default_validators + validators
def to_python(self, value): def to_python(self, value):