[soc2009/model-validation] use RegexValidator in RegexField

declarative definition prepared for RegexValidator children

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

1 files changed, 1 insertions, 11 deletions

diff --git a/django/forms/fields.py b/django/forms/fields.py
index 8bf1df3f58..38ae2cec19 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -439,17 +439,7 @@ class RegexField(CharField):
         if isinstance(regex, basestring):
             regex = re.compile(regex)
         self.regex = regex
-
-    def validate(self, value):
-        """
-        Validates that the input matches the regular expression. Returns a
-        Unicode object.
-        """
-        super(RegexField, self).validate(value)
-        if value == u'':
-            return value
-        if not self.regex.search(value):
-            raise ValidationError(self.error_messages['invalid'])
+        self.validators.append(validators.RegexValidator(regex=regex))
 
 class EmailField(CharField):
     default_error_messages = {