From 6db3356c4d1aa4f9a042b0ec67d47238abc16dd7 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 12 Sep 2014 10:21:35 +0100
Subject: NON_FIELD_ERRORS_KEY setting

---
 rest_framework/serializers.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'rest_framework/serializers.py')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 502b1e19..0c2aedfa 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -198,7 +198,9 @@ class Serializer(BaseSerializer):
         Dict of native values <- Dict of primitive datatypes.
         """
         if not isinstance(data, dict):
-            raise ValidationError({'non_field_errors': ['Invalid data']})
+            raise ValidationError({
+                api_settings.NON_FIELD_ERRORS_KEY: ['Invalid data']
+            })
 
         ret = {}
         errors = {}
@@ -224,7 +226,9 @@ class Serializer(BaseSerializer):
         try:
             return self.validate(ret)
         except ValidationError as exc:
-            raise ValidationError({'non_field_errors': exc.messages})
+            raise ValidationError({
+                api_settings.NON_FIELD_ERRORS_KEY: exc.messages
+            })
 
     def to_representation(self, instance):
         """
-- 
cgit v1.2.3