Django

Code

Changeset 5684

Show
Ignore:
Timestamp:
07/13/07 07:03:20 (1 year ago)
Author:
mtredinnick
Message:

Fixed #4861 -- Removed some duplicated logic from the newforms RegexField? by
making it a subclass of CharField?. Thanks, Collin Grady.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/newforms/fields.py

    r5680 r5684  
    299299        raise ValidationError(ugettext(u'Enter a valid date/time.')) 
    300300 
    301 class RegexField(Field): 
     301class RegexField(CharField): 
    302302    def __init__(self, regex, max_length=None, min_length=None, error_message=None, *args, **kwargs): 
    303303        """ 
    …… 
    306306        'Enter a valid value' is too generic for you. 
    307307        """ 
    308         super(RegexField, self).__init__(*args, **kwargs) 
     308        super(RegexField, self).__init__(max_length, min_length, *args, **kwargs) 
    309309        if isinstance(regex, basestring): 
    310310            regex = re.compile(regex) 
    311311        self.regex = regex 
    312         self.max_length, self.min_length = max_length, min_length 
    313312        self.error_message = error_message or ugettext(u'Enter a valid value.') 
    314313 
    …… 
    318317        Unicode object. 
    319318        """ 
    320         super(RegexField, self).clean(value) 
    321         if value in EMPTY_VALUES: 
    322             value = u'' 
    323         value = smart_unicode(value) 
     319        value = super(RegexField, self).clean(value) 
    324320        if value == u'': 
    325321            return value 
    326         if self.max_length is not None and len(value) > self.max_length: 
    327             raise ValidationError(ugettext(u'Ensure this value has at most %d characters.') % self.max_length) 
    328         if self.min_length is not None and len(value) < self.min_length: 
    329             raise ValidationError(ugettext(u'Ensure this value has at least %d characters.') % self.min_length) 
    330322        if not self.regex.search(value): 
    331323            raise ValidationError(self.error_message)