diff options
Diffstat (limited to 'paste/util/dateinterval.py')
| -rw-r--r-- | paste/util/dateinterval.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/paste/util/dateinterval.py b/paste/util/dateinterval.py index 5109e28..023bce4 100644 --- a/paste/util/dateinterval.py +++ b/paste/util/dateinterval.py @@ -7,7 +7,7 @@ years (leap years in particular). Accepts (y)ear, (b)month, (w)eek, (d)ay, (h)our, (m)inute, (s)econd. -Exports only timeEncode and timeDecode functions. +Exports only timeEncode and timeDecode functions. """ import re @@ -33,7 +33,7 @@ timeValues = { timeOrdered = list(timeValues.items()) timeOrdered.sort(key=lambda x: x[1], reverse=True) - + def interval_encode(seconds, include_sign=False): """Encodes a number of seconds (representing a time interval) into a form like 1h2d3s. @@ -80,7 +80,7 @@ def interval_decode(s): s = s[1:] for match in allMatches(s, _timeRE): char = match.group(0)[-1].lower() - if not timeValues.has_key(char): + if char not in timeValues: # @@: should signal error continue time += int(match.group(0)[:-1]) * timeValues[char] |