Ticket #11907: 11907.2.diff

django/forms/fields.py

@@ -414 +414 @@
         'invalid': _(u'Enter a valid e-mail address.'),
     }
     default_validators = [validators.validate_email]
+         
+    def clean(self, value): 
+        if value is None:
+            value = u''
+        value = smart_str(value).strip() 
+        value = super(EmailField, self).clean(value) 
+        return value 
 
 class FileField(Field):
     widget = FileInput

tests/regressiontests/forms/fields.py

@@ -425 +425 @@
         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')