Merge pull request #1665 from smal/modelserialization-charfield-with-null

Modelserialization charfield with null

1 files changed, 5 insertions, 1 deletions

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index d5c8134b..6caae924 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -474,8 +474,12 @@ 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 isinstance(value, six.string_types):
             return value
+
+        if value is None:
+            return ''
+
         return smart_text(value)