mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-07 11:19:12 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/model-validation] Migrated CharField to use validators

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@12018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Honza Král 2009-12-29 04:04:59 +00:00
parent 22795e154f
commit c3e94faa23
5 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
django/forms/fields.py
View File

@ -170,19 +170,13 @@ class Field(object):
return result return result
class CharField(Field): class CharField(Field):
default_error_messages = {
'max_length': _(u'Ensure this value has at most %(max)d characters (it has %(length)d).'),
'min_length': _(u'Ensure this value has at least %(min)d characters (it has %(length)d).'),
}
def __init__(self, max_length=None, min_length=None, *args, **kwargs): def __init__(self, max_length=None, min_length=None, *args, **kwargs):
self.max_length, self.min_length = max_length, min_length self.max_length, self.min_length = max_length, min_length
super(CharField, self).__init__(*args, **kwargs) super(CharField, self).__init__(*args, **kwargs)
# TODO: use this as soon as you make regex validator and use it in RegexField if min_length is not None:
#if min_length is not None: self.validators.append(validators.MinLengthValidator(min_length))
# self.validators.append(validators.MinLengthValidator(min_length)) if max_length is not None:
#if max_length is not None: self.validators.append(validators.MaxLengthValidator(max_length))
# self.validators.append(validators.MaxLengthValidator(max_length))
def to_python(self, value): def to_python(self, value):
"Returns a Unicode object." "Returns a Unicode object."
@ -190,18 +184,6 @@ class CharField(Field):
return u'' return u''
return smart_unicode(value) return smart_unicode(value)
def validate(self, value):
"Validates max_length and min_length."
super(CharField, self).validate(value)
if value in validators.EMPTY_VALUES:
# non-required field, no need for further validation
return
value_length = len(value)
if self.max_length is not None and value_length > self.max_length:
raise ValidationError(self.error_messages['max_length'] % {'max': self.max_length, 'length': value_length})
if self.min_length is not None and value_length < self.min_length:
raise ValidationError(self.error_messages['min_length'] % {'min': self.min_length, 'length': value_length})
def widget_attrs(self, widget): def widget_attrs(self, widget):
if self.max_length is not None and isinstance(widget, (TextInput, PasswordInput)): if self.max_length is not None and isinstance(widget, (TextInput, PasswordInput)):
# The HTML attribute is maxlength, not max_length. # The HTML attribute is maxlength, not max_length.

12
tests/regressiontests/forms/error_messages.py
View File

@ -6,8 +6,8 @@ tests = r"""
# CharField ################################################################### # CharField ###################################################################
>>> e = {'required': 'REQUIRED'} >>> e = {'required': 'REQUIRED'}
>>> e['min_length'] = 'LENGTH %(length)s, MIN LENGTH %(min)s' >>> e['min_length'] = 'LENGTH %(show_value)s, MIN LENGTH %(limit_value)s'
>>> e['max_length'] = 'LENGTH %(length)s, MAX LENGTH %(max)s' >>> e['max_length'] = 'LENGTH %(show_value)s, MAX LENGTH %(limit_value)s'
>>> f = CharField(min_length=5, max_length=10, error_messages=e) >>> f = CharField(min_length=5, max_length=10, error_messages=e)
>>> f.clean('') >>> f.clean('')
Traceback (most recent call last): Traceback (most recent call last):
@ -156,8 +156,8 @@ ValidationError: [u'INVALID']
>>> e = {'required': 'REQUIRED'} >>> e = {'required': 'REQUIRED'}
>>> e['invalid'] = 'INVALID' >>> e['invalid'] = 'INVALID'
>>> e['min_length'] = 'LENGTH %(length)s, MIN LENGTH %(min)s' >>> e['min_length'] = 'LENGTH %(show_value)s, MIN LENGTH %(limit_value)s'
>>> e['max_length'] = 'LENGTH %(length)s, MAX LENGTH %(max)s' >>> e['max_length'] = 'LENGTH %(show_value)s, MAX LENGTH %(limit_value)s'
>>> f = RegexField(r'^\d+$', min_length=5, max_length=10, error_messages=e) >>> f = RegexField(r'^\d+$', min_length=5, max_length=10, error_messages=e)
>>> f.clean('') >>> f.clean('')
Traceback (most recent call last): Traceback (most recent call last):
@ -180,8 +180,8 @@ ValidationError: [u'LENGTH 11, MAX LENGTH 10']
>>> e = {'required': 'REQUIRED'} >>> e = {'required': 'REQUIRED'}
>>> e['invalid'] = 'INVALID' >>> e['invalid'] = 'INVALID'
>>> e['min_length'] = 'LENGTH %(length)s, MIN LENGTH %(min)s' >>> e['min_length'] = 'LENGTH %(show_value)s, MIN LENGTH %(limit_value)s'
>>> e['max_length'] = 'LENGTH %(length)s, MAX LENGTH %(max)s' >>> e['max_length'] = 'LENGTH %(show_value)s, MAX LENGTH %(limit_value)s'
>>> f = EmailField(min_length=8, max_length=10, error_messages=e) >>> f = EmailField(min_length=8, max_length=10, error_messages=e)
>>> f.clean('') >>> f.clean('')
Traceback (most recent call last): Traceback (most recent call last):

2
tests/regressiontests/forms/fields.py
View File

@ -386,7 +386,7 @@ class FieldsTests(TestCase):
def test_regexfield_31(self): def test_regexfield_31(self):
f = RegexField('^\d+$', min_length=5, max_length=10) f = RegexField('^\d+$', min_length=5, max_length=10)
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 5 characters (it has 3).']", f.clean, '123') self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 5 characters (it has 3).']", f.clean, '123')
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 5 characters (it has 3).']", f.clean, 'abc') self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 5 characters (it has 3).', u'Enter a valid value.']", f.clean, 'abc')
self.assertEqual(u'12345', f.clean('12345')) self.assertEqual(u'12345', f.clean('12345'))
self.assertEqual(u'1234567890', f.clean('1234567890')) self.assertEqual(u'1234567890', f.clean('1234567890'))
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at most 10 characters (it has 11).']", f.clean, '12345678901') self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at most 10 characters (it has 11).']", f.clean, '12345678901')

8
tests/regressiontests/forms/localflavor/ar.py
View File

@ -28,7 +28,7 @@ u'C1064AAB'
>>> f.clean('C1064AABB') >>> f.clean('C1064AABB')
Traceback (most recent call last): Traceback (most recent call last):
... ...
ValidationError: [u'Ensure this value has at most 8 characters (it has 9).'] ValidationError: [u'Ensure this value has at most 8 characters (it has 9).', u'Enter a postal code in the format NNNN or ANNNNAAA.']
>>> f.clean('C1064AA') >>> f.clean('C1064AA')
Traceback (most recent call last): Traceback (most recent call last):
... ...
@ -44,7 +44,7 @@ ValidationError: [u'Enter a postal code in the format NNNN or ANNNNAAA.']
>>> f.clean('500') >>> f.clean('500')
Traceback (most recent call last): Traceback (most recent call last):
... ...
ValidationError: [u'Ensure this value has at least 4 characters (it has 3).'] ValidationError: [u'Ensure this value has at least 4 characters (it has 3).', u'Enter a postal code in the format NNNN or ANNNNAAA.']
>>> f.clean('5PPP') >>> f.clean('5PPP')
Traceback (most recent call last): Traceback (most recent call last):
... ...
@ -78,7 +78,7 @@ u'C1064AAB'
>>> f.clean('C1064AABB') >>> f.clean('C1064AABB')
Traceback (most recent call last): Traceback (most recent call last):
... ...
ValidationError: [u'Ensure this value has at most 8 characters (it has 9).'] ValidationError: [u'Ensure this value has at most 8 characters (it has 9).', u'Enter a postal code in the format NNNN or ANNNNAAA.']
>>> f.clean('C1064AA') >>> f.clean('C1064AA')
Traceback (most recent call last): Traceback (most recent call last):
... ...
@ -94,7 +94,7 @@ ValidationError: [u'Enter a postal code in the format NNNN or ANNNNAAA.']
>>> f.clean('500') >>> f.clean('500')
Traceback (most recent call last): Traceback (most recent call last):
... ...
ValidationError: [u'Ensure this value has at least 4 characters (it has 3).'] ValidationError: [u'Ensure this value has at least 4 characters (it has 3).', u'Enter a postal code in the format NNNN or ANNNNAAA.']
>>> f.clean('5PPP') >>> f.clean('5PPP')
Traceback (most recent call last): Traceback (most recent call last):
... ...

10
tests/regressiontests/forms/localflavor/is_.py
View File

@ -15,11 +15,11 @@ u'230880-3449'
>>> f.clean('230880343') >>> f.clean('230880343')
Traceback (most recent call last): Traceback (most recent call last):
... ...
ValidationError: [u'Ensure this value has at least 10 characters (it has 9).'] ValidationError: [u'Ensure this value has at least 10 characters (it has 9).', u'Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.']
>>> f.clean('230880343234') >>> f.clean('230880343234')
Traceback (most recent call last): Traceback (most recent call last):
... ...
ValidationError: [u'Ensure this value has at most 11 characters (it has 12).'] ValidationError: [u'Ensure this value has at most 11 characters (it has 12).', u'Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.']
>>> f.clean('abcdefghijk') >>> f.clean('abcdefghijk')
Traceback (most recent call last): Traceback (most recent call last):
... ...
@ -61,18 +61,18 @@ ValidationError: [u'Enter a valid value.']
>>> f.clean('123456') >>> f.clean('123456')
Traceback (most recent call last): Traceback (most recent call last):
... ...
ValidationError: [u'Ensure this value has at least 7 characters (it has 6).'] ValidationError: [u'Ensure this value has at least 7 characters (it has 6).', u'Enter a valid value.']
>>> f.clean('123456555') >>> f.clean('123456555')
Traceback (most recent call last): Traceback (most recent call last):
... ...
ValidationError: [u'Ensure this value has at most 8 characters (it has 9).'] ValidationError: [u'Ensure this value has at most 8 characters (it has 9).', u'Enter a valid value.']
>>> f.clean('abcdefg') >>> f.clean('abcdefg')
Traceback (most recent call last): Traceback (most recent call last):
ValidationError: [u'Enter a valid value.'] ValidationError: [u'Enter a valid value.']
>>> f.clean(' 1234567 ') >>> f.clean(' 1234567 ')
Traceback (most recent call last): Traceback (most recent call last):
... ...
ValidationError: [u'Ensure this value has at most 8 characters (it has 9).'] ValidationError: [u'Ensure this value has at most 8 characters (it has 9).', u'Enter a valid value.']
>>> f.clean(' 12367 ') >>> f.clean(' 12367 ')
Traceback (most recent call last): Traceback (most recent call last):
... ...