Ticket #1566: validators.diff

core/validators.py

@@ -382 +382 @@
         if not self.regexp.search(field_data):
             raise ValidationError(self.error_message)
 
-class AnyValidator:
+class SomeValidators:
+
+    """Validates if `num_required` of given validators pass.
+    
+    This validator tries all given validators in order.  Once the
+    `num_required` number of validators pass, validation passes without
+    any further testing.  If `num_required` is not met, a validation error
+    is raised with the given message.  The message is rather unspecific,
+    so it's best to specify one on instantiation.
     """
-    This validator tries all given validators. If any one of them succeeds,
-    validation passes. If none of them succeeds, the given message is thrown
-    as a validation error. The message is rather unspecific, so it's best to
-    specify one on instantiation.
-    """
-    def __init__(self, validator_list=[], error_message=gettext_lazy("This field is invalid.")):
+
+    def __init__(self, num_required, validator_list=[], error_message=gettext_lazy("This field is invalid.")):
+        self.num_required = num_required
         self.validator_list = validator_list
         self.error_message = error_message
         for v in validator_list:
@@ -397 +402 @@
                 self.always_test = True
 
     def __call__(self, field_data, all_data):
+        validated_count = 0
         for v in self.validator_list:
             try:
                 v(field_data, all_data)
-                return
             except ValidationError, e:
                 pass
+            else:
+                validated_count += 1
+                if validated_count >= self.num_required:
+                    return
         raise ValidationError(self.error_message)
 
+class AnyValidator(SomeValidators):
+
+    """Validates if any one of the given validators pass.
+    
+    This validator tries all given validators in order.  Once a validator
+    succeeds, validation passes.  If none of them succeed, a validation
+    error is raised with the given message.  The message is rather
+    unspecific, so it's best to specify one on instantiation.
+    """
+
+    def __init__(self, num_required=1, validator_list=[], error_message=gettext_lazy("This field is invalid.")):
+        SomeValidators.__init__(self, num_required, validator_list=validator_list, error_message=error_message)
+
 class URLMimeTypeCheck:
     "Checks that the provided URL points to a document with a listed mime type"
     class CouldNotRetrieve(ValidationError):