Ticket #12498: complex-validators.diff

django/core/validators.py

@@ -135 +135 @@
     message = _(u'Ensure this value has at most %(limit_value)d characters (it has %(show_value)d).')
     code = 'max_length'
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

django/db/models/base.py

@@ -799 +799 @@
             except ValidationError, e:
                 errors[f.name] = e.messages
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         # Form.clean() is run even if other validation fails, so do the
         # same with Model.validate() for consistency.
         try:

django/db/models/fields/__init__.py

@@ -176 +176 @@
 
         errors = []
         for v in self.validators:
-            try:
-                v(value)
-            except exceptions.ValidationError, e:
-                if hasattr(e, 'code') and e.code in self.error_messages:
-                    message = self.error_messages[e.code]
-                    if e.params:
-                        message = message % e.params
-                    errors.append(message)
-                else:
-                    errors.extend(e.messages)
+            # Don't run complex validators since they need the model instance
+            # and must therefore be run on the model level.
+            if not isinstance(v, validators.ComplexValidator):
+                try:
+                    v(value)
+                except exceptions.ValidationError, e:
+                    if hasattr(e, 'code') and e.code in self.error_messages:
+                        message = self.error_messages[e.code]
+                        if e.params:
+                            message = message % e.params
+                        errors.append(message)
+                    else:
+                        errors.extend(e.messages)
         if errors:
             raise exceptions.ValidationError(errors)
 

django/forms/fields.py

@@ -130 +130 @@
             return
         errors = []
         for v in self.validators:
-            try:
-                v(value)
-            except ValidationError, e:
-                if hasattr(e, 'code') and e.code in self.error_messages:
-                    message = self.error_messages[e.code]
-                    if e.params:
-                        message = message % e.params
-                    errors.append(message)
-                else:
-                    errors.extend(e.messages)
+            # 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):
+                try:
+                    v(value)
+                except ValidationError, e:
+                    if hasattr(e, 'code') and e.code in self.error_messages:
+                        message = self.error_messages[e.code]
+                        if e.params:
+                            message = message % e.params
+                        errors.append(message)
+                    else:
+                        errors.extend(e.messages)
         if errors:
             raise ValidationError(errors)
 

django/forms/forms.py

@@ -3 +3 @@
 """
 
 from django.core.exceptions import ValidationError
+
 from django.utils.copycompat import deepcopy
 from django.utils.datastructures import SortedDict
 from django.utils.html import conditional_escape
@@ -282 +283 @@
                 self._errors[name] = self.error_class(e.messages)
                 if name in self.cleaned_data:
                     del self.cleaned_data[name]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         try:
             self.cleaned_data = self.clean()
         except ValidationError, e:

tests/modeltests/validation/models.py

@@ -1 +1 @@
 from datetime import datetime
 
 from django.core.exceptions import ValidationError
+
 from django.db import models
 from django.test import TestCase
 
@@ -8 +9 @@
     if value != 42:
         raise ValidationError('This is not the answer to life, universe and everything!', code='not42')
 
+
+
+
+
+
+
+
+
 class ModelToValidate(models.Model):
     name = models.CharField(max_length=100)
     created = models.DateTimeField(default=datetime.now)
@@ -15 +24 @@
     parent = models.ForeignKey('self', blank=True, null=True)
     email = models.EmailField(blank=True)
     url = models.URLField(blank=True)
-    f_with_custom_validator = models.IntegerField(blank=True, null=True, validators=[validate_answer_to_universe])
+    f_with_custom_validator = models.IntegerField(blank=True, null=True, validators=[validate_answer_to_universe])
 
     def validate(self):
         super(ModelToValidate, self).validate()
@@ -49 +58 @@
     other  = models.IntegerField(blank=True, null=True)
     number = models.IntegerField(
             error_messages={'null': 'NULL', 'not42': 'AAARGH', 'not_equal': '%s != me'},
-            validators=[validate_answer_to_universe]
+            validators=[validate_answer_to_universe]
         )
 
 

tests/modeltests/validation/test_custom_messages.py

@@ -1 +1 @@
 from modeltests.validation import ValidationTestCase
-from models import CustomMessagesModel
-
 
+
 class CustomMessagesTest(ValidationTestCase):
+
+
+
+
     def test_custom_simple_validator_message(self):
         cmm = CustomMessagesModel(number=12)
         self.assertFieldFailsValidationWithMessage(cmm.full_validate, 'number', ['AAARGH'])

tests/modeltests/validation/validators.py

@@ -18 +18 @@
                 [u'This is not the answer to life, universe and everything!']
             )
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

tests/modeltests/validators/tests.py

@@ -9 +9 @@
         validate_integer, validate_email, validate_slug, validate_ipv4_address,
         validate_comma_separated_integer_list, MaxValueValidator,
         MinValueValidator, MaxLengthValidator, MinLengthValidator,
-        URLValidator, BaseValidator, RegexValidator,
+        RequiredIfOtherFieldBlank, URLValidator, BaseValidator,
+        RegexValidator,
 )
 
 now = datetime.now()
@@ -152 +153 @@
     setattr(TestSimpleValidators, *get_simple_test_func(validator, expected, value, test_counter))
     test_counter += 1
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

tests/regressiontests/forms/tests.py

@@ -38 +38 @@
 from media import media_tests
 
 from fields import FieldsTests
-from validators import TestFieldWithValidators
+from validators import TestFieldWithValidators
 
 __test__ = {
     'extra_tests': extra_tests,

tests/regressiontests/forms/validators.py

@@ -4 +4 @@
 from django.core import validators
 from django.core.exceptions import ValidationError
 
+
+
+
 
 class TestFieldWithValidators(TestCase):
     def test_all_errors_get_reported(self):
@@ -16 +19 @@
         except ValidationError, e:
             self.assertEqual(2, len(e.messages))
 
+
+
+
+
+
+
+
+
+
+
+
+
+