Merge pull request #708 from kevinastone/master

Fixed DateField with Empty Values (Fixes #707)

1 files changed, 4 insertions, 0 deletions

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index fe555ee5..e9bae0ec 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -534,6 +534,8 @@ class DateField(WritableField):
         raise ValidationError(msg)
 
     def to_native(self, value):
+        if value is None:
+            return None
         if isinstance(value, datetime.datetime):
             value = value.date()
         if self.format.lower() == ISO_8601:
@@ -599,6 +601,8 @@ class DateTimeField(WritableField):
         raise ValidationError(msg)
 
     def to_native(self, value):
+        if value is None:
+            return None
         if self.format.lower() == ISO_8601:
             return value.isoformat()
         return value.strftime(self.format)