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

Don't remove spaces from input string.

Browse source 
This was allowing inputs like "5 5" to equal 55.
This commit is contained in:
voussoir 2021-01-18 01:08:35 -08:00
parent 8a0ed3d131
commit acab8e0c78
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
voussoirkit/bytestring.py
View file

@ -108,7 +108,7 @@ def normalize_unit_string(string):
''' '''
Given a string "k" or "kb" or "kib" in any case, return "KiB", etc. Given a string "k" or "kb" or "kib" in any case, return "KiB", etc.
''' '''
string = string.lower() string = string.lower().strip()
for (size, unit_string) in UNIT_STRINGS.items(): for (size, unit_string) in UNIT_STRINGS.items():
unit_string_l = unit_string.lower() unit_string_l = unit_string.lower()
if string in (unit_string_l, unit_string_l[0], unit_string_l.replace('i', '')): if string in (unit_string_l, unit_string_l[0], unit_string_l.replace('i', '')):
@ -121,7 +121,7 @@ def parsebytes(string):
Accepts "k", "kb", "kib" in any casing. Accepts "k", "kb", "kib" in any casing.
''' '''
string = string.lower().strip() string = string.lower().strip()
string = string.replace(' ', '').replace(',', '') string = string.replace(',', '')
matches = re.findall(r'[\d\.-]+', string) matches = re.findall(r'[\d\.-]+', string)
if len(matches) == 0: if len(matches) == 0: