Changeset 4111

Timestamp:

11/26/06 18:23:17 (2 years ago)

Author:

adrian

Message:

Fixed #3038 -- newforms: RegexField? no longer validates empty input for required=False. Thanks for reporting, Thomas Steinacher

Files:

• django/trunk/django/newforms/fields.py (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/tests.py (modified) (3 diffs)

django/trunk/django/newforms/fields.py

@@ -171 +171 @@
-        if value in EMPTY_VALUES: value = u''
-        value = smart_unicode(value)
-
+(value or self.required) and 
-            raise ValidationError(self.error_message)
-        return value

django/trunk/tests/regressiontests/forms/tests.py

@@ -485 +485 @@
->>> f.clean(None)
-u''
+>>> f.clean('')
+u''
->>> f.clean([1, 2, 3])
-u'[1, 2, 3]'
@@ -490 +492 @@
-CharField accepts an optional max_length parameter:
->>> f = CharField(max_length=10, required=False)
->>> f.clean('')
-u''
->>> f.clean('12345')
-u'12345'
@@ -701 +701 @@
-...
-ValidationError: [u'Enter a valid value.']
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f = RegexField('^\d[A-F]\d$', required=False)
+>>> f.clean('2A2')
+u'2A2'
+>>> f.clean('3F3')
+u'3F3'
+>>> f.clean('3G3')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid value.']
+>>> f.clean('')
+u''
-
-Alternatively, RegexField can take a compiled regular expression: