[1.0.X] Fixed #9640, #10549: BooleanFields with choices, a default, and null=False now correctly doesn't generate a blank option. Backport of r10500 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10502 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 7 insertions, 1 deletions

diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 8da95bb4c4..7ed497cb09 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -393,7 +393,13 @@ class BooleanField(Field):
         return bool(value)
 
     def formfield(self, **kwargs):
-        defaults = {'form_class': forms.BooleanField}
+        # Unlike most fields, BooleanField figures out include_blank from
+        # self.null instead of self.blank.
+        if self.choices:
+            include_blank = self.null or not (self.has_default() or 'initial' in kwargs)
+            defaults = {'choices': self.get_choices(include_blank=include_blank)}
+        else:
+            defaults = {'form_class': forms.BooleanField}
         defaults.update(kwargs)
         return super(BooleanField, self).formfield(**defaults)