Author: adrian
Date: 2007-01-20 11:31:45 -0600 (Sat, 20 Jan 2007)
New Revision: 4367
Modified:
django/trunk/django/newforms/fields.py
Log:
Fixed #3303 -- Cleaned some newforms clean() method implementations. Thanks for
the patch, SmileyChris
Modified: django/trunk/django/newforms/fields.py
===================================================================
--- django/trunk/django/newforms/fields.py 2007-01-20 17:25:42 UTC (rev
4366)
+++ django/trunk/django/newforms/fields.py 2007-01-20 17:31:45 UTC (rev
4367)
@@ -92,9 +92,7 @@
"Validates max_length and min_length. Returns a Unicode object."
super(CharField, self).clean(value)
if value in EMPTY_VALUES:
- value = u''
- if not self.required:
- return value
+ return u''
value = smart_unicode(value)
if self.max_length is not None and len(value) > self.max_length:
raise ValidationError(gettext(u'Ensure this value has at most %d
characters.') % self.max_length)
@@ -117,7 +115,7 @@
of int(). Returns None for empty values.
"""
super(IntegerField, self).clean(value)
- if not self.required and value in EMPTY_VALUES:
+ if value in EMPTY_VALUES:
return None
try:
value = int(value)
@@ -245,9 +243,10 @@
Unicode object.
"""
super(RegexField, self).clean(value)
- if value in EMPTY_VALUES: value = u''
+ if value in EMPTY_VALUES:
+ value = u''
value = smart_unicode(value)
- if not self.required and value == u'':
+ if value == u'':
return value
if self.max_length is not None and len(value) > self.max_length:
raise ValidationError(gettext(u'Ensure this value has at most %d
characters.') % self.max_length)
@@ -288,7 +287,7 @@
def clean(self, value):
value = super(URLField, self).clean(value)
- if not self.required and value == u'':
+ if value == u'':
return value
if self.verify_exists:
import urllib2
@@ -329,9 +328,10 @@
Validates that the input is in self.choices.
"""
value = super(ChoiceField, self).clean(value)
- if value in EMPTY_VALUES: value = u''
+ if value in EMPTY_VALUES:
+ value = u''
value = smart_unicode(value)
- if not self.required and value == u'':
+ if value == u'':
return value
valid_values = set([str(k) for k, v in self.choices])
if value not in valid_values:
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
