Ticket #7755: django-models-validation-emailfield-blank.patch

django/db/models/fields/__init__.py

@@ -747 +747 @@
         return [oldforms.EmailField]
 
     def validate(self, field_data, all_data):
-        validators.isValidEmail(field_data, all_data)
+        if field_data:
+            validators.isValidEmail(field_data, all_data)
 
     def formfield(self, **kwargs):
         defaults = {'form_class': forms.EmailField}

tests/modeltests/validation/models.py

@@ -16 +16 @@
     birthdate = models.DateField()
     favorite_moment = models.DateTimeField()
     email = models.EmailField()
+    private_email = models.EmailField(blank=True)
 
     def __unicode__(self):
         return self.name
@@ -130 +131 @@
 >>> p.favorite_moment
 datetime.datetime(2002, 4, 3, 0, 0)
 
->>> p = Person(**dict(valid_params, email='john@example.com'))
+>>> p = Person(**dict(valid_params, email='', private_email=''))
 >>> p.validate()
+{'email': [u'This field is required.']}
+>>> p.email, p.private_email
+('', '')
+
+>>> p = Person(**dict(valid_params, email='john@example.com', private_email='john@example.com'))
+>>> p.validate()
 {}
->>> p.email
-'john@example.com'
+>>> p.email, p.private_email
+('john@example.com', 'john@example.com')
 
->>> p = Person(**dict(valid_params, email=u'john@example.com'))
+>>> p = Person(**dict(valid_params, email=u'john@example.com', private_email=u'john@example.com'))
 >>> p.validate()
 {}
->>> p.email
-u'john@example.com'
+>>> p.email, p.private_email
+(u'john@example.com', u'john@example.com')
 
->>> p = Person(**dict(valid_params, email=22))
->>> p.validate()['email']
-[u'Enter a valid e-mail address.']
+>>> p = Person(**dict(valid_params, email=22, private_email=22))
+>>> p.validate().values()
+[[u'Enter a valid e-mail address.'], [u'Enter a valid e-mail address.']]
 
 # Make sure that Date and DateTime return validation errors and don't raise Python errors.
 >>> p = Person(name='John Doe', is_child=True, email='abc@def.com')