encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-02 20:54:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken None value for TimeField.

Browse Source 
Refs #707.
This commit is contained in:
Tom Christie 2013-03-07 09:03:53 +00:00
parent f5a8f172a3
commit ad336cc636
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rest_framework/fields.py
View File

@ -536,8 +536,10 @@ class DateField(WritableField):
def to_native(self, value): def to_native(self, value):
if value is None: if value is None:
return None return None
if isinstance(value, datetime.datetime): if isinstance(value, datetime.datetime):
value = value.date() value = value.date()
if self.format.lower() == ISO_8601: if self.format.lower() == ISO_8601:
return value.isoformat() return value.isoformat()
return value.strftime(self.format) return value.strftime(self.format)
@ -603,6 +605,7 @@ class DateTimeField(WritableField):
def to_native(self, value): def to_native(self, value):
if value is None: if value is None:
return None return None
if self.format.lower() == ISO_8601: if self.format.lower() == ISO_8601:
return value.isoformat() return value.isoformat()
return value.strftime(self.format) return value.strftime(self.format)
@ -653,8 +656,12 @@ class TimeField(WritableField):
raise ValidationError(msg) raise ValidationError(msg)
def to_native(self, value): def to_native(self, value):
if value is None:
return None
if isinstance(value, datetime.datetime): if isinstance(value, datetime.datetime):
value = value.time() value = value.time()
if self.format.lower() == ISO_8601: if self.format.lower() == ISO_8601:
return value.isoformat() return value.isoformat()
return value.strftime(self.format) return value.strftime(self.format)