From 5a367717fa3d8a575605ac9da3436f445ef2f16e Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 24 Feb 2024 07:20:32 -0500
Subject: [PATCH 1/3] 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:

From 6d4d3df659630cef68729e542411b892314b66b3 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 24 Feb 2024 10:25:32 -0500
Subject: [PATCH 2/3] Administrivia

---
 admin-tools/setup-master.sh     | 1 -
 admin-tools/setup-python-2.4.sh | 1 -
 2 files changed, 2 deletions(-)

diff --git a/admin-tools/setup-master.sh b/admin-tools/setup-master.sh
index 2a474fc2..2683f71a 100755
--- a/admin-tools/setup-master.sh
+++ b/admin-tools/setup-master.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 # Check out master branch and dependent development master branches
-set -e
 PYTHON_VERSION=3.8.18
 
 bs=${BASH_SOURCE[0]}
diff --git a/admin-tools/setup-python-2.4.sh b/admin-tools/setup-python-2.4.sh
index ed6d2bde..d54125ca 100755
--- a/admin-tools/setup-python-2.4.sh
+++ b/admin-tools/setup-python-2.4.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 # Check out python-2.4-to-2.7 and dependent development branches.
 
-set -e
 PYTHON_VERSION=2.4.6
 
 bs=${BASH_SOURCE[0]}

From 27dfb956d5c6468e5da32b43140342ecdd21ada2 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 24 Feb 2024 10:26:45 -0500
Subject: [PATCH 3/3] Administrivia

---
 admin-tools/setup-python-3.0.sh | 1 -
 admin-tools/setup-python-3.3.sh | 1 -
 2 files changed, 2 deletions(-)

diff --git a/admin-tools/setup-python-3.0.sh b/admin-tools/setup-python-3.0.sh
index 8ff1c538..a4f94156 100644
--- a/admin-tools/setup-python-3.0.sh
+++ b/admin-tools/setup-python-3.0.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 # Check out python-3.0-to-3.2 and dependent development branches.
 
-set -e
 PYTHON_VERSION=3.0.1
 
 bs=${BASH_SOURCE[0]}
diff --git a/admin-tools/setup-python-3.3.sh b/admin-tools/setup-python-3.3.sh
index 5f6f8ea7..9603d06e 100755
--- a/admin-tools/setup-python-3.3.sh
+++ b/admin-tools/setup-python-3.3.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 # Check out python-3.3-to-3.5 and dependent development branches.
-set -e
 PYTHON_VERSION=3.3.7
 
 bs=${BASH_SOURCE[0]}