From 144f52da8ed0bbd558540486cce8812aaf4a9a19 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Tue, 12 Nov 2019 06:08:30 -0500
Subject: [PATCH] More 3.0 control flow pattern fixups

---
 test/bytecode_3.0/03_ifelse.pyc       | Bin 1149 -> 1386 bytes
 test/simple_source/bug30/03_ifelse.py |  11 +++++++++--
 uncompyle6/parsers/parse30.py         |   2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/test/bytecode_3.0/03_ifelse.pyc b/test/bytecode_3.0/03_ifelse.pyc
index b619b7198c5d273f08a5263973269a620f9026ca..fa86044c03c436fc60a1020c1bcd65c16795a348 100644
GIT binary patch
delta 497
zcmZuuy-EW?5T3canB+VKMG!3vk$@Y5g|V~|grH5D>jXJ2n~h04E+Knc1R@q%*q-+e
zV((iBzKGx>D9$VfEF74bZ~pe1-TkV3__dQ@&EI=^yOQun9Kxrhx|P=&I}ZStF7!(f
ziWN#qj|_{KhoZG`V1cl3VGJ-vxOV{4T|iD#&f(m$m_N5Ym*(=%dV|j}Y~tCqHb`J#
z!+}Yq;U+!TuXSwVF$XN{m#W(oWMG*c=A4!QGlUQyX$z;gb>26**Z5>cdX(xcPGvE2
zMZ>0<SgT}UN(3g^P|Zw*&_$+ZaW7HDiyPia?qp%l3!ahceKHH0*|t}l1mqAV#NKE2
z6bS&m6F*?LBY4bmbmBxSVY$nEjOk_bsj{SmWfE&`Z!Hros15=Ofz5*rf>HFlzLG;F
kZ=#4-(EJgAWn9Ou@QQEuXv_T5TpW7mKDSnbV6|HQ0ggmii2wiq

delta 282
zcmaFG^_N55nunJw-uPr}G6ND|0<s-|xL9eTyox}u1}l)A3=#wZrin2c+9eDOHH-`;
zj0{;!3|Y(!%}fl8c~T6FKw*#=3rGwmIdQ#_D9C_P79f#UnwMP43}h5n7EgStC=4<b
zERk50UR=ruQZZSc)nIZI<4<F_g+Nh|7O*xWAOmhW(Aol4psh>{!HgXYKuagLF`bnM
z*;C2|Br=OL^NLFn^O93bIe=WxlGLKaq@2mA%o>bLllz#(CU0a8X7<xyo_v|baIzGu
M8wW@yCl3!d0GPEh761SM

diff --git a/test/simple_source/bug30/03_ifelse.py b/test/simple_source/bug30/03_ifelse.py
index 4d80ed4e..fcb813fd 100644
--- a/test/simple_source/bug30/03_ifelse.py
+++ b/test/simple_source/bug30/03_ifelse.py
@@ -1,7 +1,7 @@
 # Adapted from 3.0 base64
 # Problem was handling if/else which
 # needs to be like Python 2.6 (and not like 2.7 or 3.1)
-def main(args, f):
+def main(args, f, func, sys):
     """Small main program"""
     if args and args[0] != '-':
         func(f, sys.stdout.buffer)
@@ -24,7 +24,14 @@ def parse_marked_section(fn, i, rawdata, report=1):
 # in its gen_comp_body, we can use COME_FROM in its place.
 # As above omission of JUMPs is a feature of 3.0 that doesn't
 # seem to be in later versions (or earlier like 2.6).
-def __and__(self, other):
+def __and__(self, other, Iterable):
     if not isinstance(other, Iterable):
         return NotImplemented
     return self._from_iterable(value for value in other if value in self)
+
+# Adapted from 3.0.1 abc.py
+# Bug was in handling multiple COME_FROMs in return_if_stmt
+def __instancecheck__(subtype, subclass, cls):
+    if subtype:
+        if (cls and subclass):
+            return False
diff --git a/uncompyle6/parsers/parse30.py b/uncompyle6/parsers/parse30.py
index f8de3014..00c79605 100644
--- a/uncompyle6/parsers/parse30.py
+++ b/uncompyle6/parsers/parse30.py
@@ -136,7 +136,7 @@ class Python30Parser(Python31Parser):
         except_handler ::= jmp_abs COME_FROM_EXCEPT except_stmts
                            POP_TOP END_FINALLY
 
-        return_if_stmt ::= ret_expr RETURN_END_IF COME_FROM POP_TOP
+        return_if_stmt ::= ret_expr RETURN_END_IF come_froms POP_TOP
         and            ::= expr jmp_false expr come_from_opt
         whilestmt      ::= SETUP_LOOP testexpr l_stmts_opt come_from_opt
                            JUMP_BACK come_froms POP_TOP POP_BLOCK COME_FROM_LOOP