From 2f8d8b499ec50bd3832d1a25fd12b671341d02e9 Mon Sep 17 00:00:00 2001 From: Kevin Stone Date: Wed, 6 Mar 2013 15:16:37 -0800 Subject: 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 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) -- cgit v1.2.3