Merge pull request #3731 from mjparker777/master

tomchristie · tomchristie · commit 18cdfcd712a5 · 2015-12-18T11:27:12.000Z
Issue 3726 DateTimeField not handling empty values
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -1061,6 +1061,9 @@ def to_internal_value(self, value):
         self.fail('invalid', format=humanized_format)
 
     def to_representation(self, value):
+        if not value:
+            return None
+
         output_format = getattr(self, 'format', api_settings.DATETIME_FORMAT)
 
         if output_format is None:
@@ -1118,11 +1121,11 @@ def to_internal_value(self, value):
         self.fail('invalid', format=humanized_format)
 
     def to_representation(self, value):
-        output_format = getattr(self, 'format', api_settings.DATE_FORMAT)
-
         if not value:
             return None
 
+        output_format = getattr(self, 'format', api_settings.DATE_FORMAT)
+
         if output_format is None:
             return value
 
@@ -1183,6 +1186,9 @@ def to_internal_value(self, value):
         self.fail('invalid', format=humanized_format)
 
     def to_representation(self, value):
+        if not value:
+            return None
+
         output_format = getattr(self, 'format', api_settings.TIME_FORMAT)
 
         if output_format is None:
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -959,7 +959,9 @@ class TestDateTimeField(FieldValues):
     }
     outputs = {
         datetime.datetime(2001, 1, 1, 13, 00): '2001-01-01T13:00:00',
-        datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z'
+        datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z',
+        None: None,
+        '': None,
     }
     field = serializers.DateTimeField(default_timezone=timezone.UTC())
 
@@ -1028,7 +1030,9 @@ class TestTimeField(FieldValues):
         '99:99': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]].'],
     }
     outputs = {
-        datetime.time(13, 00): '13:00:00'
+        datetime.time(13, 00): '13:00:00',
+        None: None,
+        '': None,
     }
     field = serializers.TimeField()
 

Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,9 @@ class TestDateTimeField(FieldValues):`
`959`	`959`	`}`
`960`	`960`	`outputs = {`
`961`	`961`	`datetime.datetime(2001, 1, 1, 13, 00): '2001-01-01T13:00:00',`
`962`		`- datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z'`
	`962`	`+ datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z',`
	`963`	`+ None: None,`
	`964`	`+ '': None,`
`963`	`965`	`}`
`964`	`966`	`field = serializers.DateTimeField(default_timezone=timezone.UTC())`
`965`	`967`
`@@ -1028,7 +1030,9 @@ class TestTimeField(FieldValues):`
`1028`	`1030`	`'99:99': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]].'],`
`1029`	`1031`	`}`
`1030`	`1032`	`outputs = {`
`1031`		`- datetime.time(13, 00): '13:00:00'`
	`1033`	`+ datetime.time(13, 00): '13:00:00',`
	`1034`	`+ None: None,`
	`1035`	`+ '': None,`
`1032`	`1036`	`}`
`1033`	`1037`	`field = serializers.TimeField()`
`1034`	`1038`