[soc2009/model-validation] Introduced ComplexValidator and changed the validator handling logic.

Field.validate() now calls all validators except for ComplexValidator
instances which are then run in the form's clean() method.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@10946 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 9 insertions, 0 deletions

diff --git a/django/forms/fields.py b/django/forms/fields.py
index 9446ed2eea..d65edd7047 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -119,6 +119,11 @@ class Field(object):
     def validate(self, value):
         if value in EMPTY_VALUES and self.required:
             raise ValidationError(self.error_messages['required'])
+        for v in self.validators:
+            # don't run complex validators since they need all_values
+            # and must therefore be run on the form level
+            if not isinstance(v, validators.ComplexValidator):
+                v(value)
 
 
     def clean(self, value):
diff --git a/django/forms/forms.py b/django/forms/forms.py
index b5c0fc06e0..912fd7c031 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -5,6 +5,7 @@ Form classes
 from copy import deepcopy
 
 from django.core.exceptions import ValidationError
+from django.core.validators import ComplexValidator
 from django.utils.datastructures import SortedDict
 from django.utils.html import conditional_escape
 from django.utils.encoding import StrAndUnicode, smart_unicode, force_unicode
@@ -254,6 +255,9 @@ class BaseForm(StrAndUnicode):
             if not name in self.cleaned_data:
                 continue
             for v in field.validators:
+                # skip noncomplex validators, they have already been run on the Field
+                if not isinstance(v, ComplexValidator):
+                    continue
                 try:
                     v(self.cleaned_data[name], all_values=self.cleaned_data)
                 except ValidationError, e: