aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorTom Christie2013-06-03 00:49:02 -0700
committerTom Christie2013-06-03 00:49:02 -0700
commit62e59f8277afdde2e35185391d8e805c4f16cf22 (patch)
treec20bdf0a6427778ec71d7e9fb73ca5b16c243482 /rest_framework/serializers.py
parentb10869a08b4effac9b8df1d776e6ffb882a1a742 (diff)
parentc176af35e5ad18e8aced7156af7f4791e8f23ca2 (diff)
downloaddjango-rest-framework-62e59f8277afdde2e35185391d8e805c4f16cf22.tar.bz2
Merge pull request #900 from copitux/fix-validation-layer
Bugfix: Fix run validation layer with invalid data
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index a4969f60..11ead02e 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -315,7 +315,8 @@ class BaseSerializer(WritableField):
self._errors = {}
if data is not None or files is not None:
attrs = self.restore_fields(data, files)
- attrs = self.perform_validation(attrs)
+ if attrs is not None:
+ attrs = self.perform_validation(attrs)
else:
self._errors['non_field_errors'] = ['No input provided']