diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 8541bc43a0..7bac2a21f6 100644
--- 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
index 9cb59f7da0..029a5bddcc 100644
--- 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()
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy