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

Merge pull request #3819 from m1kola/bug/DateField-to_representation-unicode-compatibility

Browse Source 
PY2: DateField.to_representation can't work with unicode value
This commit is contained in:
Xavier Ordoquy 2016-01-11 11:29:50 +01:00
commit edd9c7de02
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/fields.py
View File

@ -1139,7 +1139,7 @@ class DateField(Field):
) )
if output_format.lower() == ISO_8601: if output_format.lower() == ISO_8601:
if (isinstance(value, str)): if isinstance(value, six.string_types):
value = datetime.datetime.strptime(value, '%Y-%m-%d').date() value = datetime.datetime.strptime(value, '%Y-%m-%d').date()
return value.isoformat() return value.isoformat()

3
tests/test_fields.py
View File

@ -6,7 +6,7 @@ from decimal import Decimal
import django import django
import pytest import pytest
from django.http import QueryDict from django.http import QueryDict
from django.utils import timezone from django.utils import six, timezone
import rest_framework import rest_framework
from rest_framework import serializers from rest_framework import serializers
@ -895,6 +895,7 @@ class TestDateField(FieldValues):
outputs = { outputs = {
datetime.date(2001, 1, 1): '2001-01-01', datetime.date(2001, 1, 1): '2001-01-01',
'2001-01-01': '2001-01-01', '2001-01-01': '2001-01-01',
six.text_type('2016-01-10'): '2016-01-10',
None: None, None: None,
'': None, '': None,
} }