summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/forms/fields.py4
-rw-r--r--tests/regressiontests/forms/fields.py1
2 files changed, 5 insertions, 0 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index de14a5c8a8..25ba5f5bdd 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -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 = {
diff --git a/tests/regressiontests/forms/fields.py b/tests/regressiontests/forms/fields.py
index e4f2c261c9..258d644ff0 100644
--- a/tests/regressiontests/forms/fields.py
+++ b/tests/regressiontests/forms/fields.py
@@ -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')