encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-10 19:56:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor internal API cleanpu

Browse Source
This commit is contained in:
Tom Christie 2015-02-06 16:15:10 +00:00
parent 670723f021
commit 0240df1a38
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rest_framework/serializers.py
View File

@ -855,8 +855,9 @@ class ModelSerializer(Serializer):
)
# Include any kwargs defined in `Meta.extra_kwargs`
field_kwargs = self.build_field_kwargs(
field_kwargs, extra_kwargs, field_name
extra_field_kwargs = extra_kwargs.get(field_name, {})
field_kwargs = self.include_extra_kwargs(
field_kwargs, extra_field_kwargs
)
# Create the serializer field.
@ -1064,14 +1065,12 @@ class ModelSerializer(Serializer):
(field_name, model_class.__name__)
)
def build_field_kwargs(self, kwargs, extra_kwargs, field_name):
def include_extra_kwargs(self, kwargs, extra_kwargs):
"""
Include an 'extra_kwargs' that have been included for this field,
Include any 'extra_kwargs' that have been included for this field,
possibly removing any incompatible existing keyword arguments.
"""
extras = extra_kwargs.get(field_name, {})
if extras.get('read_only', False):
if extra_kwargs.get('read_only', False):
for attr in [
'required', 'default', 'allow_blank', 'allow_null',
'min_length', 'max_length', 'min_value', 'max_value',
@ -1079,10 +1078,10 @@ class ModelSerializer(Serializer):
]:
kwargs.pop(attr, None)
if extras.get('default') and kwargs.get('required') is False:
if extra_kwargs.get('default') and kwargs.get('required') is False:
kwargs.pop('required')
kwargs.update(extras)
kwargs.update(extra_kwargs)
return kwargs