Ticket #17051: 17051.diff

django/core/validators.py

@@ -51 +51 @@
         r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
         r'(?::\d+)?' # optional port
         r'(?:/?|[/?]\S+)$', re.IGNORECASE)
+    message = _(u'Enter a valid URL.')
 
     def __init__(self, verify_exists=False,
                  validator_user_agent=URL_VALIDATOR_USER_AGENT):
@@ -128 +129 @@
                 else:
                     opener.open(req)
             except ValueError:
-                raise ValidationError(_(u'Enter a valid URL.'), code='invalid')
+                raise ValidationError(self.message, code='invalid')
             except: # urllib2.URLError, httplib.InvalidURL, etc.
                 raise broken_error
 

django/forms/fields.py

@@ -46 +46 @@
     widget = TextInput # Default widget to use when rendering this type of Field.
     hidden_widget = HiddenInput # Default widget to use when rendering this as "hidden".
     default_validators = [] # Default set of validators
+    # Add an 'invalid' entry to this dictionary if you want a specific field error
+    # message not raised by the field validators.
     default_error_messages = {
         'required': _(u'This field is required.'),
-        'invalid': _(u'Enter a valid value.'),
     }
 
     # Tracks each time a Field instance is created. Used to retain order.

tests/modeltests/validation/tests.py

@@ -64 +64 @@
 
     def test_wrong_url_value_raises_error(self):
         mtv = ModelToValidate(number=10, name='Some Name', url='not a url')
-        self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', [u'Enter a valid value.'])
+        self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', [u'Enter a valid URL.'])
 
     #The tests below which use url_verify are deprecated
     def test_correct_url_but_nonexisting_gives_404(self):

tests/regressiontests/forms/tests/validators.py

@@ -3 +3 @@
 from django.core.exceptions import ValidationError
 from django.utils.unittest import TestCase
 
+class UserForm(forms.Form):
+    full_name = forms.CharField(
+        max_length = 50,
+        validators = [
+            validators.validate_integer,
+            validators.validate_email,
+        ]
+    )
+    string = forms.CharField(
+        max_length = 50,
+        validators = [
+            validators.RegexValidator(
+                regex='^[a-zA-Z]*$',
+                message=u"Letters only.",
+            )
+        ]
+    )
 
 class TestFieldWithValidators(TestCase):
     def test_all_errors_get_reported(self):
-        field = forms.CharField(
-            validators=[validators.validate_integer, validators.validate_email]
-        )
-        self.assertRaises(ValidationError, field.clean, 'not int nor mail')
+        form = UserForm({'full_name': u'not int nor mail', 'string': u'2 is not correct'})
+        self.assertRaises(ValidationError, form.fields['full_name'].clean, 'not int nor mail')
         try:
-            field.clean('not int nor mail')
+            form.fields['full_name'].clean('not int nor mail')
         except ValidationError, e:
             self.assertEqual(2, len(e.messages))
+
+        self.assertFalse(form.is_valid())
+        self.assertEqual(form.errors['string'], [u"Letters only."])