Author: russellm
Date: 2010-05-10 07:28:00 -0500 (Mon, 10 May 2010)
New Revision: 13201
Modified:
django/trunk/django/core/validators.py
django/trunk/docs/ref/validators.txt
Log:
Fixed #13341 -- Clarified default arguments to the RegexValidator. Thanks to
David Fischer for the report and patch.
Modified: django/trunk/django/core/validators.py
===================================================================
--- django/trunk/django/core/validators.py 2010-05-10 11:44:25 UTC (rev
13200)
+++ django/trunk/django/core/validators.py 2010-05-10 12:28:00 UTC (rev
13201)
@@ -21,16 +21,22 @@
code = 'invalid'
def __init__(self, regex=None, message=None, code=None):
+ print 'test'
if regex is not None:
+ print 1
self.regex = regex
if message is not None:
+ print 2
self.message = message
if code is not None:
+ print 3
self.code = code
+ print 4
if isinstance(self.regex, basestring):
+ print 5
self.regex = re.compile(regex)
-
+ print 'REGEX', type(self.regex), self.regex
def __call__(self, value):
"""
Validates that the input matches the regular expression.
Modified: django/trunk/docs/ref/validators.txt
===================================================================
--- django/trunk/docs/ref/validators.txt 2010-05-10 11:44:25 UTC (rev
13200)
+++ django/trunk/docs/ref/validators.txt 2010-05-10 12:28:00 UTC (rev
13201)
@@ -59,13 +59,13 @@
``RegexValidator``
------------------
-.. class:: RegexValidator(regex=None, message=None, code=None)
+.. class:: RegexValidator(regex, message=None, code=None)
-.. attribute:: regex=None
+.. attribute:: regex
-The regular expression pattern to search for the provided ``value``. Raises a
-``ValidationError`` with ``message`` and ``code`` if no match is found. If
-no regex is specified, an empty string is used.
+The regular expression pattern to search for the provided ``value``,
+or a pre-compiled regular expression. Raises a ``ValidationError``
+with ``message`` and ``code`` if no match is found.
.. attribute:: message=None
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
