Ticket #13511: 13511-regexvalidator.diff

django/core/validators.py

@@ -16 +16 @@
     URL_VALIDATOR_USER_AGENT = 'Django (http://www.djangoproject.com/)'
 
 class RegexValidator(object):
-    regex = ''
     message = _(u'Enter a valid value.')
     code = 'invalid'
 
-    def __init__(self, regex=None, message=None, code=None):
-        if regex is not None:
-            self.regex = regex
+    def __init__(self, regex, message=None, code=None):
         if message is not None:
             self.message = message
         if code is not None:
             self.code = code
 
-        if isinstance(self.regex, basestring):
+        if isinstance(regex, basestring):
             self.regex = re.compile(regex)
+        else:
+            # regex is already compiled
+            self.regex = regex
 
     def __call__(self, value):
         """
@@ -39 +39 @@
             raise ValidationError(self.message, code=self.code)
 
 class URLValidator(RegexValidator):
-    regex = re.compile(
+    URL_PATTERN = re.compile(
         r'^https?://' # http:// or https://
         r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?|' #domain...
         r'localhost|' #localhost...
@@ -48 +48 @@
         r'(?:/?|[/?]\S+)$', re.IGNORECASE)
 
     def __init__(self, verify_exists=False, validator_user_agent=URL_VALIDATOR_USER_AGENT):
-        super(URLValidator, self).__init__()
+        super(URLValidator, self).__init__(self.URL_PATTERN)
         self.verify_exists = verify_exists
         self.user_agent = validator_user_agent