From 6bea275de815e37dc6743213eaa1e54a31c473df Mon Sep 17 00:00:00 2001 From: Kevin Stone Date: Wed, 6 Mar 2013 15:15:19 -0800 Subject: [PATCH 1/2] Added failing test cases for giving a DateField or DateTimeField a None value to serialize. Signed-off-by: Kevin Stone --- rest_framework/tests/fields.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py index 28f18ed89..fd6de7797 100644 --- a/rest_framework/tests/fields.py +++ b/rest_framework/tests/fields.py @@ -171,6 +171,13 @@ class DateFieldTest(TestCase): self.assertEqual('1984 - 07.31', result_1) + def test_to_native_none(self): + """ + Make sure from_native() returns None on None param. + """ + f = serializers.DateField(required=False) + self.assertEqual(None, f.to_native(None)) + class DateTimeFieldTest(TestCase): """ @@ -303,6 +310,13 @@ class DateTimeFieldTest(TestCase): self.assertEqual('1984 - 04:31', result_3) self.assertEqual('1984 - 04:31', result_4) + def test_to_native_none(self): + """ + Make sure from_native() returns None on None param. + """ + f = serializers.DateTimeField(required=False) + self.assertEqual(None, f.to_native(None)) + class TimeFieldTest(TestCase): """ From 2f8d8b499ec50bd3832d1a25fd12b671341d02e9 Mon Sep 17 00:00:00 2001 From: Kevin Stone Date: Wed, 6 Mar 2013 15:16:37 -0800 Subject: [PATCH 2/2] Patched DateField and DateTimeField to check for None values before trying to perform date(time) conversion. Signed-off-by: Kevin Stone --- rest_framework/fields.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index fe555ee51..e9bae0ec9 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)