Merge pull request encode#3801 from koordinates/fix-nested-validation-error

tomchristie · tomchristie · commit f01a3d9c3641 · 2016-01-07T09:22:23.000Z
Fix nested validation error being rendered incorrectly.
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
@@ -306,7 +306,7 @@ def get_validation_error_detail(exc):
         # If errors may be a dict we use the standard {key: list of values}.
         # Here we ensure that all the values are *lists* of errors.
         return {
-            key: value if isinstance(value, list) else [value]
+            key: value if isinstance(value, (list, dict)) else [value]
             for key, value in exc.detail.items()
         }
     elif isinstance(exc.detail, list):
diff --git a/tests/test_validation.py b/tests/test_validation.py
@@ -49,6 +49,24 @@ class Meta:
         fields = ('renamed',)
 
 
+class TestNestedValidationError(TestCase):
+    def test_nested_validation_error_detail(self):
+        """
+        Ensure nested validation error detail is rendered correctly.
+        """
+        e = serializers.ValidationError({
+            'nested': {
+                'field': ['error'],
+            }
+        })
+
+        self.assertEqual(serializers.get_validation_error_detail(e), {
+            'nested': {
+                'field': ['error'],
+            }
+        })
+
+
 class TestPreSaveValidationExclusionsSerializer(TestCase):
     def test_renamed_fields_are_model_validated(self):
         """

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ def get_validation_error_detail(exc):`
`306`	`306`	`# If errors may be a dict we use the standard {key: list of values}.`
`307`	`307`	`# Here we ensure that all the values are lists of errors.`
`308`	`308`	`return {`
`309`		`- key: value if isinstance(value, list) else [value]`
	`309`	`+ key: value if isinstance(value, (list, dict)) else [value]`
`310`	`310`	`for key, value in exc.detail.items()`
`311`	`311`	`}`
`312`	`312`	`elif isinstance(exc.detail, list):`