aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorTom Christie2013-05-18 04:24:16 -0700
committerTom Christie2013-05-18 04:24:16 -0700
commit0c95405ea7d9d93c2f03add3ec8c10afad08b63a (patch)
tree845f6c301d3069b35a0587a843dc076c1b1e2226 /rest_framework/serializers.py
parent2a3056d03844a31373f1e30aec58e70616115838 (diff)
parent8fe43236a22e56d1741b49b92f0c53e01cd9e5f6 (diff)
downloaddjango-rest-framework-0c95405ea7d9d93c2f03add3ec8c10afad08b63a.tar.bz2
Merge pull request #853 from pyriku/725-blank-choice-dash
Adds BLANK_CHOICE_DASH as a choice item
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 7707de7a..500bb306 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -705,15 +705,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):