mirror of
https://github.com/django/django.git
synced 2025-07-05 10:19:20 +00:00
[1.2.X] Fixed #11907 -- EmailField now runs strip() on its input. This means mistakenly including leading or trailing spaces will not cause a validation error, and clean() will remove those spaces. Thanks, krisneuharth and djansoft. Backport of [13997].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
be190d1913
commit
fee4aa31d7
@ -433,6 +433,10 @@ class EmailField(CharField):
|
||||
}
|
||||
default_validators = [validators.validate_email]
|
||||
|
||||
def clean(self, value):
|
||||
value = self.to_python(value).strip()
|
||||
return super(EmailField, self).clean(value)
|
||||
|
||||
class FileField(Field):
|
||||
widget = FileInput
|
||||
default_error_messages = {
|
||||
|
@ -426,6 +426,7 @@ class FieldsTests(TestCase):
|
||||
self.assertEqual(u'', f.clean(''))
|
||||
self.assertEqual(u'', f.clean(None))
|
||||
self.assertEqual(u'person@example.com', f.clean('person@example.com'))
|
||||
self.assertEqual(u'example@example.com', f.clean(' example@example.com \t \t '))
|
||||
self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'foo')
|
||||
self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'foo@')
|
||||
self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'foo@bar')
|
||||
|
Loading…
x
Reference in New Issue
Block a user