From d9e23773aca210033bb4075ccbcdf2c54e25bac7 Mon Sep 17 00:00:00 2001
From: Antti Rasinen <ars@iki.fi>
Date: Fri, 23 Jan 2009 22:33:17 +0200
Subject: [PATCH] Added reject-kwarg

---
 django/forms/fields.py |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/django/forms/fields.py b/django/forms/fields.py
index ccb54d8..e157ac0 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -390,7 +390,11 @@ class DateTimeField(Field):
         raise ValidationError(self.error_messages['invalid'])
 
 class RegexField(CharField):
-    def __init__(self, regex, max_length=None, min_length=None, error_message=None, *args, **kwargs):
+    default_error_messages = {
+        'reject': _(u'Enter a valid value'),
+    }
+    
+    def __init__(self, regex, reject=None, max_length=None, min_length=None, error_message=None, *args, **kwargs):
         """
         regex can be either a string or a compiled regular expression object.
         error_message is an optional error message to use, if
@@ -404,7 +408,9 @@ class RegexField(CharField):
         super(RegexField, self).__init__(max_length, min_length, *args, **kwargs)
         if isinstance(regex, basestring):
             regex = re.compile(regex)
-        self.regex = regex
+        if reject and isinstance(reject, basestring):
+            reject = re.compile(reject)
+        self.regex, self.reject = regex, reject
 
     def clean(self, value):
         """
@@ -416,6 +422,8 @@ class RegexField(CharField):
             return value
         if not self.regex.search(value):
             raise ValidationError(self.error_messages['invalid'])
+        if self.reject and self.reject.search(value):
+            raise ValidationError(self.error_messages['rejected'])
         return value
 
 email_re = re.compile(
-- 
1.6.1

