diff options
| author | Tom Christie | 2014-10-10 14:32:02 +0100 |
|---|---|---|
| committer | Tom Christie | 2014-10-10 14:32:02 +0100 |
| commit | d8a8987ab1eb6abbaee1a0de8cfea38eafe21293 (patch) | |
| tree | fe68ab44986dd79a2af275b25ac2cf3c157fa7c9 /rest_framework/serializers.py | |
| parent | d9a199ca0ddf92f999aa37b396596d0e3e0a26d9 (diff) | |
| download | django-rest-framework-d8a8987ab1eb6abbaee1a0de8cfea38eafe21293.tar.bz2 | |
Tweaks
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 2 |
1 files changed, 1 insertions, 1 deletions
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) |