diff options
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)  | 
