Author: mtredinnick
Date: 2007-07-13 07:03:20 -0500 (Fri, 13 Jul 2007)
New Revision: 5684
Modified:
django/trunk/django/newforms/fields.py
Log:
Fixed #4861 -- Removed some duplicated logic from the newforms RegexField by
making it a subclass of CharField. Thanks, Collin Grady.
Modified: django/trunk/django/newforms/fields.py
===================================================================
--- django/trunk/django/newforms/fields.py 2007-07-13 11:05:01 UTC (rev
5683)
+++ django/trunk/django/newforms/fields.py 2007-07-13 12:03:20 UTC (rev
5684)
@@ -298,18 +298,17 @@
continue
raise ValidationError(ugettext(u'Enter a valid date/time.'))
-class RegexField(Field):
+class RegexField(CharField):
def __init__(self, regex, max_length=None, min_length=None,
error_message=None, *args, **kwargs):
"""
regex can be either a string or a compiled regular expression object.
error_message is an optional error message to use, if
'Enter a valid value' is too generic for you.
"""
- super(RegexField, self).__init__(*args, **kwargs)
+ super(RegexField, self).__init__(max_length, min_length, *args,
**kwargs)
if isinstance(regex, basestring):
regex = re.compile(regex)
self.regex = regex
- self.max_length, self.min_length = max_length, min_length
self.error_message = error_message or ugettext(u'Enter a valid value.')
def clean(self, value):
@@ -317,16 +316,9 @@
Validates that the input matches the regular expression. Returns a
Unicode object.
"""
- super(RegexField, self).clean(value)
- if value in EMPTY_VALUES:
- value = u''
- value = smart_unicode(value)
+ value = super(RegexField, self).clean(value)
if value == u'':
return value
- if self.max_length is not None and len(value) > self.max_length:
- raise ValidationError(ugettext(u'Ensure this value has at most %d
characters.') % self.max_length)
- if self.min_length is not None and len(value) < self.min_length:
- raise ValidationError(ugettext(u'Ensure this value has at least %d
characters.') % self.min_length)
if not self.regex.search(value):
raise ValidationError(self.error_message)
return value
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
