diff options
author | Gerhard Weis <g.weis@griffith.edu.au> | 2017-07-05 21:17:08 +1000 |
---|---|---|
committer | Gerhard Weis <g.weis@griffith.edu.au> | 2017-07-05 21:17:08 +1000 |
commit | d1a37f70cb32e5e48024645efa2fef701883cdb0 (patch) | |
tree | 01953735cf3dad7ee68c2cd4585f380dbdd6c8d5 /src/isodate/isoduration.py | |
parent | bec98f76b13f6ae23e0330ab1c660b035fdd3290 (diff) | |
download | isodate-d1a37f70cb32e5e48024645efa2fef701883cdb0.tar.gz |
use six
Diffstat (limited to 'src/isodate/isoduration.py')
-rw-r--r-- | src/isodate/isoduration.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/isodate/isoduration.py b/src/isodate/isoduration.py index d64b3c0..88829f7 100644 --- a/src/isodate/isoduration.py +++ b/src/isodate/isoduration.py @@ -33,7 +33,8 @@ format timedelta or Duration instances as ISO conforming strings. from datetime import timedelta from decimal import Decimal import re -import sys + +from six import string_types from isodate.duration import Duration from isodate.isoerror import ISO8601Error @@ -52,9 +53,6 @@ ISO8601_PERIOD_REGEX = re.compile( r"(?P<seconds>[0-9]+([,.][0-9]+)?S)?)?$") # regular expression to parse ISO duartion strings. -if sys.version_info[0] >= 3: - basestring = str - def parse_duration(datestring): """ @@ -84,7 +82,7 @@ def parse_duration(datestring): The alternative format does not support durations with years, months or days set to 0. """ - if not isinstance(datestring, basestring): + if not isinstance(datestring, string_types): raise TypeError("Expecting a string %r" % datestring) match = ISO8601_PERIOD_REGEX.match(datestring) if not match: |