Merge remote-tracking branch 'origin/master'

Author: waveform80

structa/conversions.py

@@ -68,22 +68,20 @@ def parse_bool(s, false='0', true='1'):
         raise ValueError('not a valid bool {!r}'.format(s))
 
 
-_SUFFIXES = [
-    # This ordering is important; the minutes regex must be checked *before*
-    # the months regex as one is a legitimate subset of the other
-    ('microseconds', 'm(icro)?s(ec(ond)?s?)?'),
-    ('seconds',      's(ec(ond)?s?)?'),
-    ('minutes',      'mi(n(ute)?s?)?'),
-    ('hours',        'h((ou)?rs?)?'),
-    ('days',         'd(ays?)?'),
-    ('weeks',        'w((ee)?ks?)?'),
-    ('months',       'm(on(th)?s?)?'),
-    ('years',        'y((ea)?rs?)?'),
-]
-_SPANS = [
-    (span, re.compile(r'^(?:(?P<num>[+-]?\d+)\s*{}\b)'.format(suffix)))
-    for span, suffix in _SUFFIXES
-]
+_SPANS = {
+    span: re.compile(r'(?:(?P<num>[+-]?\d+)\s*{}\b)'.format(suffix))
+    for span, suffix in [
+        ('microseconds', '(micro|u|µ)s(ec(ond)?s?)?'),
+        ('milliseconds', '(milli|m)s(ec(ond)?s?)?'),
+        ('seconds',      's(ec(ond)?s?)?'),
+        ('minutes',      'mi(n(ute)?s?)?'),
+        ('hours',        'h((ou)?rs?)?'),
+        ('days',         'd(ays?)?'),
+        ('weeks',        'w((ee)?ks?)?'),
+        ('months',       'm((on)?ths?)?'),
+        ('years',        'y((ea)?rs?)?'),
+    ]
+}
 
 
 def parse_duration(s):
@@ -106,13 +104,13 @@ def parse_duration(s):
         relativedelta(months=+1)
         >>> parse_duration('1 min')
         relativedelta(minutes=+1)
-        >>> parse_duration('1 mon')
+        >>> parse_duration('1 mth')
         relativedelta(months=+1)
 
     The set of possible durations, and their recognized suffixes is as follows:
 
     * *Microseconds*: microseconds, microsecond, microsec, micros, micro,
-      mseconds, msecond, msecs, msec, ms
+      useconds, usecond, usecs, usec, us, µseconds, µsecond, µsecs, µsec, µs
 
     * *Seconds*: seconds, second, secs, sec, s
 
@@ -130,23 +128,19 @@ def parse_duration(s):
 
     If conversion fails, :exc:`ValueError` is raised.
     """
-    spans = {span: 0 for span, regex in _SPANS}
+    spans = {span: 0 for span in _SPANS}
     t = s
-    while True:
-        t = t.lstrip(' \t\n,')
-        if not t:
-            return relativedelta(**spans)
-        for span, regex in _SPANS:
-            m = regex.search(t)
-            if m:
-                spans[span] += int(m.group('num'))
-                # XXX This only truncates from the start; that in turn means
-                # that things must be ordered year/month/day/hour/etc. Make
-                # the algorithm order agnostic
-                t = t[len(m.group(0)):]
+    for span, regex in _SPANS.items():
+        m = regex.search(t)
+        if m:
+            spans[span] += int(m.group('num'))
+            t = (t[:m.start(0)] + t[m.end(0):]).strip(' \t\n,')
+            if not t:
                 break
-        else:
-            raise ValueError('invalid duration {}'.format(s))
+    if t:
+        raise ValueError('invalid duration {}'.format(s))
+    spans['microseconds'] += spans.pop('milliseconds') * 1000
+    return relativedelta(**spans)
 
 
 def parse_duration_or_timestamp(s):

tests/test_conversions.py

@@ -43,6 +43,7 @@ def test_parse_duration():
     assert parse_duration('1h') == relativedelta(hours=1)
     assert parse_duration('1hrs, 5mins') == relativedelta(hours=1, minutes=5)
     assert parse_duration('60 seconds') == relativedelta(minutes=1)
+    assert parse_duration('1s-50ms') == relativedelta(seconds=1, microseconds=-50000)
     with pytest.raises(ValueError):
         parse_duration('foo')