Ticket #13511: 13511-regexvalidator2.diff

docs/ref/validators.txt

@@ -60 +60 @@
 
 ``RegexValidator``
 ------------------
-.. class:: RegexValidator(regex, [message=None, code=None])
+.. class:: RegexValidator([regex=None, message=None, code=None])
 
     .. attribute:: regex
 
         The regular expression pattern to search for the provided ``value``,
         or a pre-compiled regular expression. Raises a
         :exc:`~django.core.exceptions.ValidationError` with :attr:`.message`
-        and :attr:`.code` if no match is found.
+        and :attr:`.code` if no match is found. Matches any string (including
+        the empty string) if set to ``None``.
 
     .. attribute:: message
 

tests/modeltests/validators/tests.py

@@ -112 +112 @@
     (BaseValidator(True), True, None),
     (BaseValidator(True), False, ValidationError),
 
+    (RegexValidator(), '', None),
+    (RegexValidator(), 'x1x2', None),
+    (RegexValidator('[0-9]+'), 'xxxxxx', ValidationError),
+    (RegexValidator('[0-9]+'), '1234', None),
+    (RegexValidator(re.compile('[0-9]+')), '1234', None),
     (RegexValidator('.*'), '', None),
     (RegexValidator(re.compile('.*')), '', None),
     (RegexValidator('.*'), 'xxxxx', None),

django/core/validators.py

@@ -29 +29 @@
         if code is not None:
             self.code = code
 
+        # compile the regex if it was not passed pre-compiled
         if isinstance(self.regex, basestring):
-            self.regex = re.compile(regex)
+            self.regex = re.compile(self.regex)
 
     def __call__(self, value):
         """