Non-required fields with 'allow_null=True' should not imply a default value (encode#5639)

RomuloOliveira · carltongibson · commit 905a5579dfaa · 2017-12-01T09:54:25.000+01:00
Ref encode#5518.
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -442,10 +442,10 @@ def get_attribute(self, instance):
         except (KeyError, AttributeError) as exc:
             if self.default is not empty:
                 return self.get_default()
-            if self.allow_null:
-                return None
             if not self.required:
                 raise SkipField()
+            if self.allow_null:
+                return None
             msg = (
                 'Got {exc_type} when attempting to get a value for field '
                 '`{field}` on serializer `{serializer}`.\nThe serializer '
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
@@ -372,6 +372,14 @@ def create(self, validated_data):
         serializer.save()
         assert serializer.data == {'included': 'abc'}
 
+    def test_not_required_output_for_allow_null_field(self):
+        class ExampleSerializer(serializers.Serializer):
+            omitted = serializers.CharField(required=False, allow_null=True)
+            included = serializers.CharField()
+
+        serializer = ExampleSerializer({'included': 'abc'})
+        assert 'omitted' not in serializer.data
+
 
 class TestDefaultOutput:
     def setup(self):
