Ticket #5957: bool.diff

django/newforms/fields.py

@@ -101 +101 @@
 
         Raises ValidationError for any errors.
         """
+        from operator import or_
         if self.required and value in EMPTY_VALUES:
             raise ValidationError(self.error_messages['required'])
         return value
@@ -535 +536 @@
 
     def clean(self, value):
         """Returns a Python boolean object."""
+        if value == 'False':
+            value = False
         super(BooleanField, self).clean(value)
         # Explicitly check for the string 'False', which is what a hidden field
         # will submit for False. Because bool("True") == True, we don't need to
         # handle that explicitly.
-        if value == 'False':
-            return False
+        if not bool(value) and self.required:
+            raise ValidationError(self.error_messages['required'])
         return bool(value)
 
 class NullBooleanField(BooleanField):

tests/regressiontests/forms/fields.py

@@ -937 +937 @@
 >>> f.clean(True)
 True
 >>> f.clean(False)
-False
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
 >>> f.clean(1)
 True
 >>> f.clean(0)
-False
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
 >>> f.clean('Django rocks')
 True
 
 >>> f.clean('True')
 True
 >>> f.clean('False')
-False
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
 
 >>> f = BooleanField(required=False)
 >>> f.clean('')