Commit fee4aa31 authored by Chris Beaven's avatar Chris Beaven
Browse files

[1.2.X] Fixed #11907 -- EmailField now runs strip() on its input. This means... 

[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
parent be190d19

django/forms/fields.py

+4 −0
Original line number Diff line number Diff line
@@ -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 = {

tests/regressiontests/forms/fields.py

+1 −0
Original line number Diff line number Diff line
@@ -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')