encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-29 21:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Flake8

Browse Source
This commit is contained in:
Tom Christie 2014-10-10 15:08:43 +01:00
parent d8a8987ab1
commit b5a4216aff
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/serializers.py
View File

@ -555,7 +555,7 @@ class ModelSerializer(Serializer):
depth = getattr(self.Meta, 'depth', 0) depth = getattr(self.Meta, 'depth', 0)
extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) 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) extra_kwargs = self._include_additional_options(extra_kwargs)