From 34587d8a2a5fd6cfd5fbe70b4b328a65d2407e0d Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon, 10 May 2010 12:28:00 +0000
Subject: [PATCH] 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
---
 django/core/validators.py |  8 +++++++-
 docs/ref/validators.txt   | 10 +++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/django/core/validators.py b/django/core/validators.py
index b1b82dbf0d..bcf7789c25 100644
--- a/django/core/validators.py
+++ b/django/core/validators.py
@@ -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.
diff --git a/docs/ref/validators.txt b/docs/ref/validators.txt
index b921f8cd3b..bbba84c7f9 100644
--- a/docs/ref/validators.txt
+++ b/docs/ref/validators.txt
@@ -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