Fix boolean checkboxes setting to False. Closes #3258. Closes #2776.

rest_framework/fields.py

@@ -280,9 +280,7 @@ class Field(object):
         self.allow_null = allow_null
 
         if self.default_empty_html is not empty:
-            if not required:
+            if default is not empty:
-                self.default_empty_html = empty
-            elif default is not empty:
                 self.default_empty_html = default
 
         if validators is not None:

tests/test_fields.py

@@ -227,19 +227,27 @@ class TestInvalidErrorKey:
 
 
 class TestBooleanHTMLInput:
-    def setup(self):
-        class TestSerializer(serializers.Serializer):
-            archived = serializers.BooleanField()
-        self.Serializer = TestSerializer
-
     def test_empty_html_checkbox(self):
         """
         HTML checkboxes do not send any value, but should be treated
         as `False` by BooleanField.
         """
-        # This class mocks up a dictionary like object, that behaves
+        class TestSerializer(serializers.Serializer):
-        # as if it was returned for multipart or urlencoded data.
+            archived = serializers.BooleanField()
-        serializer = self.Serializer(data=QueryDict(''))
+
+        serializer = TestSerializer(data=QueryDict(''))
+        assert serializer.is_valid()
+        assert serializer.validated_data == {'archived': False}
+
+    def test_empty_html_checkbox_not_required(self):
+        """
+        HTML checkboxes do not send any value, but should be treated
+        as `False` by BooleanField, even if the field is required=False.
+        """
+        class TestSerializer(serializers.Serializer):
+            archived = serializers.BooleanField(required=False)
+
+        serializer = TestSerializer(data=QueryDict(''))
         assert serializer.is_valid()
         assert serializer.validated_data == {'archived': False}