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

Rename variables byte_value -> number, string -> unit_string.

Browse source
This commit is contained in:
Ethan Dalool 2020-03-12 14:03:56 -07:00
parent 46487d7a31
commit 430002f914
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
voussoirkit/bytestring.py
View file

@ -108,21 +108,21 @@ def parsebytes(string):
raise ValueError('No numbers found.') raise ValueError('No numbers found.')
if len(matches) > 1: if len(matches) > 1:
raise ValueError('Too many numbers found.') raise ValueError('Too many numbers found.')
byte_value = matches[0] number = matches[0]
if not string.startswith(byte_value): if not string.startswith(number):
raise ValueError('Number is not at start of string.') raise ValueError('Number is not at start of string.')
# if the string has no text besides the number, just return that int. # if the string has no text besides the number, return that int of bytes.
string = string.replace(byte_value, '') unit_string = string.replace(number, '')
byte_value = float(byte_value) if unit_string == '':
if string == '': return int(float(number))
return int(byte_value)
unit_string = normalize_unit_string(string) number = float(number)
unit_string = normalize_unit_string(unit_string)
multiplier = REVERSED_UNIT_STRINGS[unit_string] multiplier = REVERSED_UNIT_STRINGS[unit_string]
return int(byte_value * multiplier) return int(number * multiplier)
def main(args=None): def main(args=None):
for line in pipeable.go(args, strip=True, skip_blank=True): for line in pipeable.go(args, strip=True, skip_blank=True):