From 0e54c37fabab366bb06f059b57e186cd5f7cd241 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 23 Nov 2017 14:29:31 -0500
Subject: [PATCH] Trystmt grammar from 3.3 needed in 3.2

Add test to cover this
---
 test/bytecode_3.2/03_if_try_raise.pyc       | Bin 0 -> 659 bytes
 test/simple_source/bug32/03_if_try_raise.py |  21 ++++++++++++++++++++
 uncompyle6/parsers/parse32.py               |   7 +++++++
 3 files changed, 28 insertions(+)
 create mode 100644 test/bytecode_3.2/03_if_try_raise.pyc
 create mode 100644 test/simple_source/bug32/03_if_try_raise.py

diff --git a/test/bytecode_3.2/03_if_try_raise.pyc b/test/bytecode_3.2/03_if_try_raise.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..34afcf12a318fa4b8d5dac2ee1d14ce967289d7e
GIT binary patch
literal 659
zcmb7?%Ps^#6o&uP7i7!`7VJbKVHSd5B_cK!A|YWhmrZA;yGS$LJ?bJ_ngt%gvshVJ
zcrd4G+_t*=oIZ7`{_n5q^q}6Ty)MpoWBj>@>wON@;FJK*K$i=`S<~ZAY?HmlIHoy{
zIMfHH3Xtz8r%(|tfhT}k*Y5~4;i?9?4I<K>B|Q-y2^}}-yU82Sy$`xuLgnK=un5`4
zBaqj@nkx9xv^u;aet7YNkG3NOj_}5WkO?bJ`{J~7R-1UxA*#?4=10yyln@W0qqKA0
zzdfSQ2RSyAoYPzjDa}xe#EkQp2Zh{OY}#|1IwxuJC@!+BmnX{1aN|gn{h}w6!*8Xj
zardlLT4V>esdkvdlLHHKgj192G!vtSbyixA`1T_gS0><Bk}7RNE_zx^W$ZF>8@rC%
zlIvvZqRA6*$t-iF(rh>okt&Rg#d_adY;CS@Y(?pLq-7b&UaG{}uyhzDv>7`41<Rl@
q@@a}1G)=Qy^X)B+DsR<0ZrcCjSN7}rZ|eyL?Pf({24c^-Tk}sAABTVd

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug32/03_if_try_raise.py b/test/simple_source/bug32/03_if_try_raise.py
new file mode 100644
index 00000000..d9fe1c50
--- /dev/null
+++ b/test/simple_source/bug32/03_if_try_raise.py
@@ -0,0 +1,21 @@
+# From 3.2 distutils/core
+# Ensure we handle funky trystmt
+def setup (ok, dist, **attrs):
+    if ok:
+        try:
+            dist.run_commands()
+        except KeyboardInterrupt:
+            raise SystemExit("interrupted")
+        except IOError as exc:
+            error = exc
+            if dist:
+                raise
+            else:
+                raise SystemExit(error)
+        except (RuntimeError) as msg:
+            if dist:
+                raise
+            else:
+                raise SystemExit("error: " + str(msg))
+
+    return dist
diff --git a/uncompyle6/parsers/parse32.py b/uncompyle6/parsers/parse32.py
index 4c790563..ae15a1ad 100644
--- a/uncompyle6/parsers/parse32.py
+++ b/uncompyle6/parsers/parse32.py
@@ -21,6 +21,13 @@ class Python32Parser(Python3Parser):
         whileTruestmt  ::= SETUP_LOOP l_stmts_opt JUMP_BACK COME_FROM_LOOP
         whileTruestmt  ::= SETUP_LOOP return_stmts          COME_FROM_LOOP
 
+        # Python 3.5+ has jump optimization to remove the redundant
+        # jump_excepts. But in 3.3 we need them added
+
+        trystmt     ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
+                        try_middle
+                        jump_excepts come_from_except_clauses
+
         try_middle ::= JUMP_FORWARD COME_FROM_EXCEPT except_stmts
                        END_FINALLY