aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2014-10-10 15:08:43 +0100
committerTom Christie2014-10-10 15:08:43 +0100
commitb5a4216aff06bfb36238d0f587d8645db0ee4a69 (patch)
treec73afbd3cf5d006a8789c63bf615155d16a93288
parentd8a8987ab1eb6abbaee1a0de8cfea38eafe21293 (diff)
downloaddjango-rest-framework-b5a4216aff06bfb36238d0f587d8645db0ee4a69.tar.bz2
Flake8
-rw-r--r--rest_framework/serializers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 0f6cf2bc..f3f5c837 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -555,7 +555,7 @@ class ModelSerializer(Serializer):
depth = getattr(self.Meta, 'depth', 0)
extra_kwargs = getattr(self.Meta, 'extra_kwargs', {})
- assert not (fields and exclude), "Cannot set both 'fields' and 'exclude'."
+ assert not (fields and exclude), "Cannot set both 'fields' and 'exclude'."
extra_kwargs = self._include_additional_options(extra_kwargs)