diff options
| author | Mark McArdle | 2013-05-18 13:12:30 +0100 |
|---|---|---|
| committer | Mark McArdle | 2013-05-18 13:12:30 +0100 |
| commit | 50a8f114fca0a43da42b1ad03aea2d2ace752b85 (patch) | |
| tree | d9ab709e37d5628a07df898984a17c3bee809831 /rest_framework/serializers.py | |
| parent | 611919aa0aee261100a3cbfa9ed9b746d56ce3da (diff) | |
| parent | a0e3c44c99a61a6dc878308bdf0890fbb10c41e4 (diff) | |
| download | django-rest-framework-50a8f114fca0a43da42b1ad03aea2d2ace752b85.tar.bz2 | |
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 5 |
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): |
