voussoir/etiquette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Let parse_unit_string try int before float.

Browse source
This commit is contained in:
voussoir 2020-09-19 04:01:33 -07:00
parent 865c3011e5
commit 7412ef5162
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
etiquette/helpers.py
View file

@ -293,14 +293,19 @@ def now(timestamp=True):
def parse_unit_string(s): def parse_unit_string(s):
''' '''
Try to parse the string as a float, or bytestring, or hms. Try to parse the string as an int, float, or bytestring, or hms.
''' '''
if s is None: if s is None:
return None return None
s = s.strip()
if ':' in s: if ':' in s:
return hms_to_seconds(s) return hms_to_seconds(s)
elif all(c in '0123456789' for c in s):
return int(s)
elif all(c in '0123456789.' for c in s): elif all(c in '0123456789.' for c in s):
return float(s) return float(s)