diff options
| author | Tom Christie | 2014-01-12 06:52:40 -0800 |
|---|---|---|
| committer | Tom Christie | 2014-01-12 06:52:40 -0800 |
| commit | 07cff7b37f23489579ad9effeea9365725b7cc82 (patch) | |
| tree | 219a03e808f239c6ca7d5e270fb278b78788a0ad /rest_framework/serializers.py | |
| parent | 52686420f4bf866064ee88a15903665f14289394 (diff) | |
| parent | cd9a4194ea4f4dc0e43a34485cd8a27eba44a39a (diff) | |
| download | django-rest-framework-07cff7b37f23489579ad9effeea9365725b7cc82.tar.bz2 | |
Merge pull request #1348 from yprez/none-to-empty-string_2.4
Coerce None to empty string
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index fa935306..cbf73fc3 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -804,6 +804,10 @@ class ModelSerializer(Serializer): issubclass(model_field.__class__, models.PositiveSmallIntegerField): kwargs['min_value'] = 0 + if model_field.null and \ + issubclass(model_field.__class__, (models.CharField, models.TextField)): + kwargs['allow_none'] = True + attribute_dict = { models.CharField: ['max_length'], models.CommaSeparatedIntegerField: ['max_length'], |