Commit 34587d8a authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #13341 -- Clarified default arguments to the RegexValidator. Thanks to... 

Fixed #13341 -- Clarified default arguments to the RegexValidator. Thanks to David Fischer for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13201 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent b82a5b9d

django/core/validators.py

+7 −1
Original line number Diff line number Diff line
@@ -21,16 +21,22 @@ class RegexValidator(object): 
    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.

docs/ref/validators.txt

+5 −5
Original line number Diff line number Diff line
@@ -59,13 +59,13 @@ methods. 
``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