Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Use decimal.Decimal in utils.parse_number

Browse source
This commit is contained in:
jesopo 2018-10-12 11:28:14 +01:00
parent d427e29936
commit d460375629
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/utils/__init__.py
View file

@ -1,7 +1,6 @@
from . import irc, http import decimal, io, re
import io, re
from src import ModuleManager from src import ModuleManager
from . import irc, http
TIME_SECOND = 1 TIME_SECOND = 1
TIME_MINUTE = TIME_SECOND*60 TIME_MINUTE = TIME_SECOND*60
@ -86,21 +85,25 @@ def to_pretty_time(total_seconds, minimum_unit=UNIT_SECOND, max_units=6):
return out return out
def parse_number(s): def parse_number(s):
if s.isdigit(): try:
decimal.Decimal(s)
return s return s
except:
pass
unit = s[-1].lower() unit = s[-1].lower()
number = s[:-1] number = s[:-1]
if not number.isdigit(): try:
number = decimal.Decimal(number)
except:
raise ValueError("Invalid format '%s' passed to parse_number" % number) raise ValueError("Invalid format '%s' passed to parse_number" % number)
number = int(number)
if unit == "k": if unit == "k":
number *= 1_000 number *= decimal.Decimal("1_000")
elif unit == "m": elif unit == "m":
number *= 1_000_000 number *= decimal.Decimal("1_000_000")
elif unit == "b": elif unit == "b":
number *= 1_000_000_000 number *= decimal.Decimal("1_000_000_000")
else: else:
raise ValueError("Unknown unit '%s' given to parse_number" % unit) raise ValueError("Unknown unit '%s' given to parse_number" % unit)
return str(number) return str(number)