Skip to content

Commit 88e7f66

Browse files
committed
Use six to check against string types
1 parent 6800ed9 commit 88e7f66

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

adapters/fields.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import datetime
55
import dateutil.parser
66
from decimal import Decimal
7+
import six
78

89
from .base import BaseField
910
from .utils import EMPTY_VALUES, undefined
@@ -56,7 +57,7 @@ class DateField(BaseField):
5657
def prepare(self, data):
5758
if isinstance(data, datetime.date):
5859
return data
59-
elif isinstance(data, str):
60+
elif isinstance(data, six.string_types):
6061
return dateutil.parser.parse(data).date()
6162
else:
6263
raise ValueError("Invalid date argument")
@@ -66,7 +67,7 @@ class DateTimeField(BaseField):
6667
def prepare(self, data):
6768
if isinstance(data, datetime.datetime):
6869
return data
69-
elif isinstance(data, str):
70+
elif isinstance(data, six.string_types):
7071
return dateutil.parser.parse(data)
7172
else:
7273
raise ValueError("Invalid date argument")
@@ -95,7 +96,7 @@ class TimeField(BaseField):
9596
def prepare(self, data):
9697
if isinstance(data, datetime.time):
9798
return data
98-
elif isinstance(data, str):
99+
elif isinstance(data, six.string_types):
99100
return dateutil.parser.parse(data).timetz()
100101
else:
101102
raise ValueError("Invalid time argument")

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
future
22
python-dateutil==2.6.0
3+
six

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
install_requires=[
2020
'future',
2121
'python-dateutil>=2.6.0',
22+
'six',
2223
],
2324
)

0 commit comments

Comments
 (0)