From d8a8987ab1eb6abbaee1a0de8cfea38eafe21293 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 10 Oct 2014 14:32:02 +0100
Subject: Tweaks

---
 rest_framework/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 2f683562..0f6cf2bc 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)
 
-- 
cgit v1.2.3