You've already forked python-uncompyle6
mirror of
https://github.com/rocky/python-uncompyle6.git
synced 2025-08-04 09:22:40 +08:00
Merge hell
This commit is contained in:
@@ -240,7 +240,7 @@ def main_bin():
|
|||||||
start_offset=0,
|
start_offset=0,
|
||||||
stop_offset=-1,
|
stop_offset=-1,
|
||||||
)
|
)
|
||||||
result = [options.get("do_verify", None)] + list(result)
|
result = list(result)
|
||||||
if len(pyc_paths) > 1:
|
if len(pyc_paths) > 1:
|
||||||
mess = status_msg(*result)
|
mess = status_msg(*result)
|
||||||
print("# " + mess)
|
print("# " + mess)
|
||||||
|
@@ -416,7 +416,7 @@ class Python38Parser(Python37Parser):
|
|||||||
[opname[: opname.rfind("_")] for opname in self.seen_ops]
|
[opname[: opname.rfind("_")] for opname in self.seen_ops]
|
||||||
)
|
)
|
||||||
|
|
||||||
custom_ops_processed = {"DICT_MERGE"}
|
custom_ops_processed = set(["DICT_MERGE"])
|
||||||
|
|
||||||
# Loop over instructions adding custom grammar rules based on
|
# Loop over instructions adding custom grammar rules based on
|
||||||
# a specific instruction seen.
|
# a specific instruction seen.
|
||||||
|
Reference in New Issue
Block a user