|
|
@ -1773,7 +1773,7 @@ def parse_duration(s):
|
|
|
|
s = s.strip()
|
|
|
|
s = s.strip()
|
|
|
|
|
|
|
|
|
|
|
|
days, hours, mins, secs, ms = [None] * 5
|
|
|
|
days, hours, mins, secs, ms = [None] * 5
|
|
|
|
m = re.match(r'(?:(?:(?:(?P<days>[0-9]+):)?(?P<hours>[0-9]+):)?(?P<mins>[0-9]+):)?(?P<secs>[0-9]+)(?P<ms>\.[0-9]+)?$', s)
|
|
|
|
m = re.match(r'(?:(?:(?:(?P<days>[0-9]+):)?(?P<hours>[0-9]+):)?(?P<mins>[0-9]+):)?(?P<secs>[0-9]+)(?P<ms>\.[0-9]+)?Z?$', s)
|
|
|
|
if m:
|
|
|
|
if m:
|
|
|
|
days, hours, mins, secs, ms = m.groups()
|
|
|
|
days, hours, mins, secs, ms = m.groups()
|
|
|
|
else:
|
|
|
|
else:
|
|
|
@ -1790,11 +1790,11 @@ def parse_duration(s):
|
|
|
|
)?
|
|
|
|
)?
|
|
|
|
(?:
|
|
|
|
(?:
|
|
|
|
(?P<secs>[0-9]+)(?P<ms>\.[0-9]+)?\s*s(?:ec(?:ond)?s?)?\s*
|
|
|
|
(?P<secs>[0-9]+)(?P<ms>\.[0-9]+)?\s*s(?:ec(?:ond)?s?)?\s*
|
|
|
|
)?$''', s)
|
|
|
|
)?Z?$''', s)
|
|
|
|
if m:
|
|
|
|
if m:
|
|
|
|
days, hours, mins, secs, ms = m.groups()
|
|
|
|
days, hours, mins, secs, ms = m.groups()
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
m = re.match(r'(?i)(?:(?P<hours>[0-9.]+)\s*(?:hours?)|(?P<mins>[0-9.]+)\s*(?:mins?\.?|minutes?)\s*)$', s)
|
|
|
|
m = re.match(r'(?i)(?:(?P<hours>[0-9.]+)\s*(?:hours?)|(?P<mins>[0-9.]+)\s*(?:mins?\.?|minutes?)\s*)Z?$', s)
|
|
|
|
if m:
|
|
|
|
if m:
|
|
|
|
hours, mins = m.groups()
|
|
|
|
hours, mins = m.groups()
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|