jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Replace 'has_key' with 'in'

Browse Source 
modified:   src/stub/scripts/bin2h.py
	modified:   src/stub/scripts/xstrip.py
	modified:   src/stub/src/arch/i086/cleanasm.py
This commit is contained in:
John Reiser 2025-10-08 14:35:13 -07:00
parent 59d5d25a77
commit a3d5a0a7b8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/stub/scripts/bin2h.py
View File

@ -326,7 +326,7 @@ def main(argv):
r_methods.reverse() r_methods.reverse()
for method in r_methods: for method in r_methods:
method, odata = compress_stub(method, idata) method, odata = compress_stub(method, idata)
if mdata_odata.has_key(method): if method in mdata_odata:
assert mdata_odata[method] == odata assert mdata_odata[method] == odata
else: else:
mdata_odata[method] = odata mdata_odata[method] = odata

2
src/stub/scripts/xstrip.py
View File

@ -88,7 +88,7 @@ def check_dump(dump_fn):
assert int(f[0], 10) == len(sections) assert int(f[0], 10) == len(sections)
e = f[1], int(f[2], 16), int(f[5], 16), int(f[6][3:], 10), len(sections) e = f[1], int(f[2], 16), int(f[5], 16), int(f[6][3:], 10), len(sections)
sections.append(e) sections.append(e)
assert not section_names.has_key(e[0]), e assert not e[0] in section_names, e
assert not e[0].endswith(":"), ("bad section name", e) assert not e[0].endswith(":"), ("bad section name", e)
section_names[e[0]] = e section_names[e[0]] = e
##print (sections) ##print (sections)

6
src/stub/src/arch/i086/cleanasm.py
View File

@ -99,11 +99,11 @@ def main(argv):
k, v = m.group(1).strip(), [0, 0, None, 0] k, v = m.group(1).strip(), [0, 0, None, 0]
assert k and v, (inst, args) assert k and v, (inst, args)
v[2] = k # new name v[2] = k # new name
if labels.has_key(k): if k in labels:
assert labels[k][:2] == v[:2] assert labels[k][:2] == v[:2]
return k, v return k, v
def add_label(k, v): def add_label(k, v):
if labels.has_key(k): if k in labels:
assert labels[k][:2] == v[:2] assert labels[k][:2] == v[:2]
else: else:
labels[k] = v labels[k] = v
@ -449,7 +449,7 @@ def main(argv):
ofp = open(ofile, "wb") ofp = open(ofile, "wb")
current_label = None current_label = None
for label, inst, args, args_label in olines: for label, inst, args, args_label in olines:
if labels.has_key(label): if label in labels:
current_label = labels[label][2] current_label = labels[label][2]
if opts.verbose: if opts.verbose:
ofp.write("%s: /* %d */\n" % (labels[label][2], labels[label][3])) ofp.write("%s: /* %d */\n" % (labels[label][2], labels[label][3]))