From 98cc8210990e3307a89d745acbbc2bcf6c665645 Mon Sep 17 00:00:00 2001
From: Serhiy Voyt
Date: Tue, 6 May 2014 20:34:30 +0300
Subject: Extended test with case of saveing model with blank not null field.

---
 rest_framework/tests/test_serializer.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'rest_framework')

diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index e688c823..d770c637 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -1236,6 +1236,8 @@ class BlankFieldTests(TestCase):
     def test_create_model_null_field(self):
         serializer = self.model_serializer_class(data={'title': None})
         self.assertEqual(serializer.is_valid(), True)
+        serializer.save()
+        self.assertTrue(serializer.object.pk is not None)
 
     def test_create_not_blank_field(self):
         """
-- 
cgit v1.2.3


From 1ce1f387b031c368e0ad315964b78f93d6be9a19 Mon Sep 17 00:00:00 2001
From: Serhiy Voyt
Date: Tue, 6 May 2014 21:57:25 +0300
Subject: Charfied from_native method returns default instead of None. Updated
 tests.

---
 rest_framework/fields.py                | 9 ++++++++-
 rest_framework/tests/models.py          | 4 +++-
 rest_framework/tests/test_serializer.py | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'rest_framework')

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)
 
 
diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index e171d3bd..fba3f8f7 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -105,6 +105,7 @@ class Album(RESTFrameworkModel):
     title = models.CharField(max_length=100, unique=True)
     ref = models.CharField(max_length=10, unique=True, null=True, blank=True)
 
+
 class Photo(RESTFrameworkModel):
     description = models.TextField()
     album = models.ForeignKey(Album)
@@ -112,7 +113,8 @@ class Photo(RESTFrameworkModel):
 
 # Model for issue #324
 class BlankFieldModel(RESTFrameworkModel):
-    title = models.CharField(max_length=100, blank=True, null=False)
+    title = models.CharField(max_length=100, blank=True, null=False,
+                             default="title")
 
 
 # Model for issue #380
diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index d770c637..82e1a89c 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -1238,6 +1238,7 @@ class BlankFieldTests(TestCase):
         self.assertEqual(serializer.is_valid(), True)
         serializer.save()
         self.assertTrue(serializer.object.pk is not None)
+        self.assertEqual(serializer.object.title, 'title')
 
     def test_create_not_blank_field(self):
         """
-- 
cgit v1.2.3


From 27be31bd8a58fc4f37b966c36d1cebe83b80ebea Mon Sep 17 00:00:00 2001
From: Serhiy Voyt
Date: Wed, 7 May 2014 18:37:08 +0300
Subject: In case of None value returns empty string instead of NoneType.

---
 rest_framework/fields.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'rest_framework')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 7858d951..aed38d5e 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -473,10 +473,7 @@ class CharField(WritableField):
             return value
 
         if value is None:
-            if self.default:
-                return self.default
-            else:
-                value
+            return ''
 
         return smart_text(value)
 
-- 
cgit v1.2.3


From 4e6a21344fd1fda28d1d63c5aa697fac5e9f8029 Mon Sep 17 00:00:00 2001
From: Serhiy Voyt
Date: Wed, 7 May 2014 18:42:02 +0300
Subject: Fixed test.

---
 rest_framework/tests/test_serializer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rest_framework')

diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index 82e1a89c..91248ce7 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -1237,8 +1237,8 @@ class BlankFieldTests(TestCase):
         serializer = self.model_serializer_class(data={'title': None})
         self.assertEqual(serializer.is_valid(), True)
         serializer.save()
-        self.assertTrue(serializer.object.pk is not None)
-        self.assertEqual(serializer.object.title, 'title')
+        self.assertIsNot(serializer.object.pk, None)
+        self.assertEqual(serializer.object.title, '')
 
     def test_create_not_blank_field(self):
         """
-- 
cgit v1.2.3