From bf60c0801003021a951d10967dfa22113350cd8a Mon Sep 17 00:00:00 2001 From: mjparker777 Date: Sun, 13 Dec 2015 12:05:04 -0700 Subject: [PATCH 1/4] Issue 3726 DateTimeField not handling empty values --- rest_framework/fields.py | 3 +++ tests/test_fields.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 8541bc43a0..fc917e213e 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: diff --git a/tests/test_fields.py b/tests/test_fields.py index 9cb59f7da0..7f79050cab 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -960,6 +960,8 @@ 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' + None: None, + '': None, } field = serializers.DateTimeField(default_timezone=timezone.UTC()) From 81775dfbae11270d7ebd3060146d0b6a25009475 Mon Sep 17 00:00:00 2001 From: mjparker777 Date: Sun, 13 Dec 2015 12:27:08 -0700 Subject: [PATCH 2/4] added missing comma --- tests/test_fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_fields.py b/tests/test_fields.py index 7f79050cab..71bb70cd8e 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -959,7 +959,7 @@ 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, } From fc08236ab84ce7c348216e9662ebec4ac0dea9a8 Mon Sep 17 00:00:00 2001 From: mjparker777 Date: Sun, 13 Dec 2015 16:09:56 -0700 Subject: [PATCH 3/4] updated timefield also --- rest_framework/fields.py | 3 +++ tests/test_fields.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index fc917e213e..53a948c064 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1186,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 71bb70cd8e..029a5bddcc 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1030,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() From d9c360845d79e4df4be96264c325b2bab5a036db Mon Sep 17 00:00:00 2001 From: mjparker777 Date: Thu, 17 Dec 2015 12:21:44 -0700 Subject: [PATCH 4/4] changed datefield to match code layout of datetime and time changes --- rest_framework/fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 53a948c064..7bac2a21f6 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1121,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 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