From 5a367717fa3d8a575605ac9da3436f445ef2f16e Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 24 Feb 2024 07:20:32 -0500 Subject: [PATCH] Merge hell --- uncompyle6/scanners/scanner37base.py | 1 + uncompyle6/semantics/n_actions.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/uncompyle6/scanners/scanner37base.py b/uncompyle6/scanners/scanner37base.py index 61268cd7..7d46b56f 100644 --- a/uncompyle6/scanners/scanner37base.py +++ b/uncompyle6/scanners/scanner37base.py @@ -306,6 +306,7 @@ class Scanner37Base(Scanner): has_arg=jump_inst.has_arg, inst_size=jump_inst.inst_size, has_extended_arg=inst.has_extended_arg, + fallthrough=False, tos_str=None, start_offset=None, ) diff --git a/uncompyle6/semantics/n_actions.py b/uncompyle6/semantics/n_actions.py index 13c34e0a..38e5e807 100644 --- a/uncompyle6/semantics/n_actions.py +++ b/uncompyle6/semantics/n_actions.py @@ -268,7 +268,7 @@ class NonterminalActions: elem = elem[0] if elem == "ADD_VALUE": if self.version < (3, 0, 0): - value = "%r" % elem.pattr + value = "%r" % repr(elem.pattr) else: value = "%s" % str(elem.pattr) else: