Charfied from_native method returns default instead of None. Updated tests.

1 files changed, 8 insertions, 1 deletions

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 8cdc5551..7858d951 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -469,8 +469,15 @@ 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:
+            if self.default:
+                return self.default
+            else:
+                value
+
         return smart_text(value)