From 6fe8a1d2baaa69cf0ca077acfbbfa55df4618b92 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 11 Jul 2024 13:59:16 -0400
Subject: [PATCH] Address long-standing Python 2.6 try/except bug

Fixes #405
---
 test/bytecode_2.4/07_try_except.pyc       | Bin 0 -> 1393 bytes
 test/simple_source/bug26/07_try_except.py |  34 ++++++++++++++++++++++
 uncompyle6/parsers/parse26.py             |   4 +++
 3 files changed, 38 insertions(+)
 create mode 100644 test/bytecode_2.4/07_try_except.pyc
 create mode 100644 test/simple_source/bug26/07_try_except.py

diff --git a/test/bytecode_2.4/07_try_except.pyc b/test/bytecode_2.4/07_try_except.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7c6a6566cfa77c24966f43fda884f7f95ed65ae5
GIT binary patch
literal 1393
zcmZux&2AGx4EAi&Kudv^O65mF8l*yVAs~?8Qt{6TsfR7JP^d=RU8mWyyOZuXG?7{%
zQN)?&-~l-B2s{o?fbFym2O^C#vB#gspT9}@=lsmV_3zyjjz10le!?r<XOjUSK-WNK
z;48opz`IQYXk@n;0Y;EFAd4Vtz)=JyYr<N4it}ii&06vayLD3HDYjwnGhX4AoM8wC
zR-hhR2GSy%O+n;pn^O?4wdFoxh0RkNP5?XhO+ZUMv}uuqP$KnwX1ld7T}bPM(w-%6
z(;5>(>nrS}Qu$;(7sMtTuD#Y4?`oS3=$0f9u;`9m;-@8X<z>G>7yO`3@y_;O=iY-m
zcON>cM-GQ6_Nmh!(F`Bdj$M|g)RMG_4VYBA5MpF${olM{1`Z;iNVxMqz>MbQ_W?lO
zgaZRB8+*T?$uPS!;J<<44|^qiM)==tf&T!8&K~nN&U<mh!!clnu?%7C<KHi~Zo`KN
z4jXXD*iFc1rNS=Pod+{1+JKe40t~N>y`PMIUPi$O7a8J<0ltrUTQNFa(2=WCSrpb*
zQ{hq?mTpsC;Rc)GHMz#t0vz(?4de>gjbMGR1sj??9)Tp$B{uK<fJz_ec1~C)+XZfs
z(5A%dcq-OZTk6D8HkROITCoIZk<H2uRt!MCwm9t97((u=N7p%`Q)xl?%==T7+Wnk*
zR<P~z&9H1UkHJ=+I5`hwlPVL%)!6kl>n^Dzw2gMZ&WW&M!A(?|WSKh^t38${E0X=T
z!u^SmLr0(4J3kOamTEDwEa-fv;(8V<mX|0wnPk||FY**S?TgZ;2rdtK6)34vRC1WK
zGG;f#LhC=0EVv62l0V`|-{<R5A79qBuVbZNxD?rH468vY+@WUleNdKTku(bq;1!NE
zRq@x8VlYP1$FGIsb9^e6zkyh8`rjeR5$6Ju+}SyqeYnB~nsZUZ%$p0*g1KzwVAjl;
ztI^d)`?S1sGAHM>ymO_`2K+c3ol(Thr_RN~jdm6b@I)ZGQ<W%9(tD7WW?9!QGd-&v
tcfHR=SF3HIMW3?Y-o=zOhlJYU7*};Dx7Ns{%vgtV@UfN<oW-SS^B2!c5%2&2

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug26/07_try_except.py b/test/simple_source/bug26/07_try_except.py
new file mode 100644
index 00000000..50fbe4e8
--- /dev/null
+++ b/test/simple_source/bug26/07_try_except.py
@@ -0,0 +1,34 @@
+# Bug portion of Issue #405 https://github.com/rocky/python-uncompyle6/issues/405
+# Bug was detecting if/else as the last item in a "try: .. except" block.
+class Saveframe(object):
+    """A saveframe. Use the classmethod from_scratch to create one."""
+
+    frame_list = {}
+
+    def frame_dict(self):
+        return
+
+    # Next line is 1477
+    def __setitem__(self, key, item):
+        # Next line is 1481
+        if isinstance(item, Saveframe):
+            try:
+                self.frame_list[key] = item
+            except TypeError:
+                if key in (self.frame_dict()):
+                    dict((frame.name, frame) for frame in self.frame_list)
+                    for pos, frame in enumerate(self.frame_list):
+                        if frame.name == key:
+                            self.frame_list[pos] = item
+                else:
+                    raise KeyError(
+                        "Saveframe with name '%s' does not exist and "
+                        "therefore cannot be written to. Use the add_saveframe method to add new saveframes."
+                        % key
+                    )
+        # Next line is 1498
+        raise ValueError("You can only assign an entry to a saveframe splice.")
+
+
+x = Saveframe()
+x.__setitem__("foo", 5)
diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py
index 26977b08..53907904 100644
--- a/uncompyle6/parsers/parse26.py
+++ b/uncompyle6/parsers/parse26.py
@@ -130,6 +130,10 @@ class Python26Parser(Python2Parser):
         # Semantic actions want else_suitel to be at index 3
         ifelsestmtl ::= testexpr c_stmts_opt cf_jb_cf_pop else_suitel
         ifelsestmtc ::= testexpr c_stmts_opt ja_cf_pop    else_suitec
+        ifelsestmt ::=  testexpr stmts_opt ja_cf_pop      else_suite
+
+        # The last except of a "try: ... except" can do this...
+        except_suite ::= stmts_opt COME_FROM JUMP_ABSOLUTE POP_TOP
 
         # Semantic actions want suite_stmts_opt to be at index 3
         with        ::= expr setupwith SETUP_FINALLY suite_stmts_opt