Handle empty data with serializer (encode#4564)

tomchristie · web-flow · commit b4199704316b · 2016-10-12T10:47:17.000+01:00
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
@@ -507,6 +507,11 @@ def data(self):
     @property
     def errors(self):
         ret = super(Serializer, self).errors
+        if isinstance(ret, list) and len(ret) == 1 and ret[0].code == 'null':
+            # Edge case. Provide a more descriptive error than
+            # "this field may not be null", when no data is passed.
+            detail = ErrorDetail('No data provided', code='null')
+            ret = {api_settings.NON_FIELD_ERRORS_KEY: [detail]}
         return ReturnDict(ret, serializer=self)
 
 
@@ -700,6 +705,11 @@ def data(self):
     @property
     def errors(self):
         ret = super(ListSerializer, self).errors
+        if isinstance(ret, list) and len(ret) == 1 and ret[0].code == 'null':
+            # Edge case. Provide a more descriptive error than
+            # "this field may not be null", when no data is passed.
+            detail = ErrorDetail('No data provided', code='null')
+            ret = {api_settings.NON_FIELD_ERRORS_KEY: [detail]}
         if isinstance(ret, dict):
             return ReturnDict(ret, serializer=self)
         return ReturnList(ret, serializer=self)
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
@@ -62,6 +62,12 @@ def create(validated_data):
         with pytest.raises(AssertionError):
             serializer.save()
 
+    def test_validate_none_data(self):
+        data = None
+        serializer = self.Serializer(data=data)
+        assert not serializer.is_valid()
+        assert serializer.errors == {'non_field_errors': ['No data provided']}
+
 
 class TestValidateMethod:
     def test_non_field_error_validate_method(self):
diff --git a/tests/test_serializer_nested.py b/tests/test_serializer_nested.py
@@ -41,6 +41,12 @@ def test_nested_serialize_empty(self):
         serializer = self.Serializer()
         assert serializer.data == expected_data
 
+    def test_nested_serialize_no_data(self):
+        data = None
+        serializer = self.Serializer(data=data)
+        assert not serializer.is_valid()
+        assert serializer.errors == {'non_field_errors': ['No data provided']}
+
 
 class TestNotRequiredNestedSerializer:
     def setup(self):
