encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-22 17:47:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2869 from ryangallen/datefield

Browse Source 
DateField to_representation can handle str and empty values. Fixes #2656, #2687.
This commit is contained in:
Tom Christie 2015-05-01 16:33:43 +01:00
commit abcd6f2b9e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/fields.py
View File

@ -925,6 +925,9 @@ class DateField(Field):
self.fail('invalid', format=humanized_format) self.fail('invalid', format=humanized_format)
def to_representation(self, value): def to_representation(self, value):
if not value:
return None
if self.format is None: if self.format is None:
return value return value
@ -938,7 +941,10 @@ class DateField(Field):
) )
if self.format.lower() == ISO_8601: if self.format.lower() == ISO_8601:
if (isinstance(value, str)):
value = datetime.datetime.strptime(value, '%Y-%m-%d').date()
return value.isoformat() return value.isoformat()
return value.strftime(self.format) return value.strftime(self.format)

5
tests/test_fields.py
View File

@ -726,7 +726,10 @@ class TestDateField(FieldValues):
datetime.datetime(2001, 1, 1, 12, 00): ['Expected a date but got a datetime.'], datetime.datetime(2001, 1, 1, 12, 00): ['Expected a date but got a datetime.'],
} }
outputs = { outputs = {
datetime.date(2001, 1, 1): '2001-01-01' datetime.date(2001, 1, 1): '2001-01-01',
'2001-01-01': '2001-01-01',
None: None,
'': None,
} }
field = serializers.DateField() field = serializers.DateField()