Apple-2-SW/cppo-ng
1
0
Fork 0
mirror of https://github.com/iKarith/cppo-ng.git synced 2024-06-01 06:41:27 +00:00
Code Issues Projects Releases Wiki Activity

Remove to_bin as we have format()

Browse Source 
Python3 already has a means of turning numerical data into a binary string with
format().  The only place it was used was with ProDOS case masks as it was, so
it's an easy call to replace the specialty function with Python's internals.
This commit is contained in:
T. Joseph Carter 2017-07-13 19:35:47 -07:00
parent 5a39fcb647
commit 666ab4d578
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
blocksfree/legacy.py
View File

@ -223,7 +223,7 @@ def getCaseMask(arg1, arg2):
if caseMaskDec < 32768: if caseMaskDec < 32768:
return None return None
else: else:
return to_bin(caseMaskDec - 32768, 15) return format(caseMaskDec - 32768, '015b')
def getFileType(arg1, arg2): def getFileType(arg1, arg2):
if g.src_shk: if g.src_shk:
@ -363,7 +363,7 @@ def getWorkingDirName(arg1, arg2=None):
if caseMaskDec < 32768: if caseMaskDec < 32768:
caseMask = None caseMask = None
else: else:
caseMask = to_bin(caseMaskDec - 32768,15) caseMask = format(caseMaskDec - 32768,'015b')
else: # subdirectory, get casemask from arg2 (not available in header) else: # subdirectory, get casemask from arg2 (not available in header)
caseMask = arg2 caseMask = arg2
if caseMask and not g.casefold_upper: if caseMask and not g.casefold_upper:
@ -812,18 +812,6 @@ def to_dec(val):
else: else:
raise Exception("to_dec() requires bytes, hex-ustr or [bin-ustr]") raise Exception("to_dec() requires bytes, hex-ustr or [bin-ustr]")
def to_bin(val, fill = None):
"""convert bytes, hex-ustr, or int/long to bin-ustr"""
if isinstance(val, bytes): # bytes
b = bin(to_dec(to_hex(val)))[2:]
elif isinstance(val, str): # hex-ustr
b = bin(int(val, 16))[2:]
elif isnumber(val): # int/long
b = bin(val)[2:]
else:
raise Exception("to_bin() requires bytes, hex-ustr, or int/long")
return b if not fill else b.zfill(fill)
def to_bytes(val): def to_bytes(val):
"""converts hex-ustr, int/long, or [bin-ustr] to bytes""" """converts hex-ustr, int/long, or [bin-ustr] to bytes"""
if isinstance(val, list): # [bin-ustr] if isinstance(val, list): # [bin-ustr]