Macintosh-Tools/python-rsrcfork
1
0
Fork 0
mirror of https://github.com/dgelessus/python-rsrcfork.git synced 2025-07-03 15:24:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix variable naming conflict in show_filtered_resources

Browse Source 
mypy does not like it when the same variable name is used for different
types, even if it is in unrelated if branches and could never actually
cause any problems.
This commit is contained in:
dgelessus
2020-07-23 13:17:02 +02:00
parent 126795239c
commit 0054d0f7b5
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rsrcfork/__main__.py
View File

@ -335,22 +335,22 @@ def show_filtered_resources(resources: typing.Sequence[api.Resource], format: st
quoted_restype = bytes_quote(res.type, "'")
print(f"data {quoted_restype} ({', '.join(parts)}{attrs_comment}) {{")
line = f.read(16)
while line:
bytes_line = f.read(16)
while bytes_line:
# Two-byte grouping is really annoying to implement.
groups = []
for j in range(0, 16, 2):
if j >= len(line):
if j >= len(bytes_line):
break
elif j+1 >= len(line):
groups.append(f"{line[j]:02X}")
elif j+1 >= len(bytes_line):
groups.append(f"{bytes_line[j]:02X}")
else:
groups.append(f"{line[j]:02X}{line[j+1]:02X}")
groups.append(f"{bytes_line[j]:02X}{bytes_line[j+1]:02X}")
s = f'$"{" ".join(groups)}"'
comment = "/* " + line.decode(_TEXT_ENCODING).translate(_TRANSLATE_NONPRINTABLES) + " */"
comment = "/* " + bytes_line.decode(_TEXT_ENCODING).translate(_TRANSLATE_NONPRINTABLES) + " */"
print(f"\t{s:<54s}{comment}")
line = f.read(16)
bytes_line = f.read(16)
print("};")
print()