diff options
| author | Yuri Prezument | 2014-01-05 15:25:16 +0200 |
|---|---|---|
| committer | Yuri Prezument | 2014-01-12 10:53:54 +0200 |
| commit | e88e3c6ae163029f0fe564dd214235ab350dbfc9 (patch) | |
| tree | d8c4063d317fdd24008d2b05616c53bf89dcc793 /rest_framework | |
| parent | 46f5c62530744017f744cdcfec91774a0566c179 (diff) | |
| download | django-rest-framework-e88e3c6ae163029f0fe564dd214235ab350dbfc9.tar.bz2 | |
Possible fix for #1330
Coerce None to '' in CharField.to_native()
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/fields.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 5ee75235..22f0120b 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -452,7 +452,9 @@ class CharField(WritableField): self.validators.append(validators.MaxLengthValidator(max_length)) def from_native(self, value): - if isinstance(value, six.string_types) or value is None: + if value is None: + return '' + if isinstance(value, six.string_types): return value return smart_text(value) |