DateField.to_representation unicode compatibility

encode · Jan 11, 2016 · 6b207d9 · 6b207d9
1 parent 057cf13
commit 6b207d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -1139,7 +1139,7 @@ def to_representation(self, value):
         )
 
         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()
             return value.isoformat()
 

diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -6,7 +6,7 @@
 import django
 import pytest
 from django.http import QueryDict
-from django.utils import timezone
+from django.utils import six, timezone
 
 import rest_framework
 from rest_framework import serializers
@@ -895,6 +895,7 @@ class TestDateField(FieldValues):
     outputs = {
         datetime.date(2001, 1, 1): '2001-01-01',
         '2001-01-01': '2001-01-01',
+        six.text_type('2016-01-10'): '2016-01-10',
         None: None,
         '': None,
     }