aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorRyan Kaskel2013-05-18 14:04:27 +0100
committerRyan Kaskel2013-05-18 14:04:27 +0100
commit0b84c5a0acef23b0b9be920cfb8926c095ae9ac2 (patch)
tree59c1f02e9878a7114bbea0c3466f41b73636cb58 /rest_framework/serializers.py
parent770ed3de2ef8339ec0b74f7eb522283718e01a3b (diff)
parenta0e3c44c99a61a6dc878308bdf0890fbb10c41e4 (diff)
downloaddjango-rest-framework-0b84c5a0acef23b0b9be920cfb8926c095ae9ac2.tar.bz2
Merge latest changes from master.
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 75f1e1d0..7efa7061 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -722,15 +722,14 @@ class ModelSerializer(Serializer):
Creates a default instance of a basic non-relational field.
"""
kwargs = {}
- has_default = model_field.has_default()
- if model_field.null or model_field.blank or has_default:
+ if model_field.null or model_field.blank:
kwargs['required'] = False
if isinstance(model_field, models.AutoField) or not model_field.editable:
kwargs['read_only'] = True
- if has_default:
+ if model_field.has_default():
kwargs['default'] = model_field.get_default()
if issubclass(model_field.__class__, models.TextField):