From dfa3a41dc981cbbcb2f3dbe16b7aa200a2afe4dc Mon Sep 17 00:00:00 2001 From: rocky Date: Thu, 30 May 2024 05:01:57 -0400 Subject: [PATCH] Merge hell --- uncompyle6/bin/uncompile.py | 2 +- uncompyle6/parsers/parse38.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uncompyle6/bin/uncompile.py b/uncompyle6/bin/uncompile.py index da1b1f3b..9c255e7b 100755 --- a/uncompyle6/bin/uncompile.py +++ b/uncompyle6/bin/uncompile.py @@ -240,7 +240,7 @@ def main_bin(): start_offset=0, stop_offset=-1, ) - result = [options.get("do_verify", None)] + list(result) + result = list(result) if len(pyc_paths) > 1: mess = status_msg(*result) print("# " + mess) diff --git a/uncompyle6/parsers/parse38.py b/uncompyle6/parsers/parse38.py index f0b66eb4..f5589734 100644 --- a/uncompyle6/parsers/parse38.py +++ b/uncompyle6/parsers/parse38.py @@ -416,7 +416,7 @@ class Python38Parser(Python37Parser): [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 # a specific instruction seen.