diff options
| author | Gerhard Weis <g.weis@griffith.edu.au> | 2017-07-05 20:54:03 +1000 |
|---|---|---|
| committer | Gerhard Weis <g.weis@griffith.edu.au> | 2017-07-05 20:54:03 +1000 |
| commit | 0d0abd79a975ed132a8eb43783f87cd84eea9267 (patch) | |
| tree | 733231867f0ff1ba3679e1d4564a1b2506353cb2 /src/isodate/isoduration.py | |
| parent | 1dc3c2481ba32e9dbcad9e55d2c20281f5aa5756 (diff) | |
| parent | 6e5802bf7b410551f1dfcaf6ede8638f0f233cad (diff) | |
| download | isodate-0d0abd79a975ed132a8eb43783f87cd84eea9267.tar.gz | |
Merge branch 'master' of https://github.com/lmazuel/isodate
# Conflicts:
# .travis.yml
# setup.cfg
# src/isodate/tzinfo.py
Diffstat (limited to 'src/isodate/isoduration.py')
| -rw-r--r-- | src/isodate/isoduration.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/isodate/isoduration.py b/src/isodate/isoduration.py index 6da69f5..d64b3c0 100644 --- a/src/isodate/isoduration.py +++ b/src/isodate/isoduration.py @@ -33,6 +33,7 @@ format timedelta or Duration instances as ISO conforming strings. from datetime import timedelta from decimal import Decimal import re +import sys from isodate.duration import Duration from isodate.isoerror import ISO8601Error @@ -51,6 +52,9 @@ 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): """ |