From 0dc19a8fddc9305cb27eceb638d7fb5ff769484a Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 29 Jun 2019 04:59:03 -0400
Subject: [PATCH] Correct 3.4 "yield from" semantic action bug

---
 test/bytecode_3.3/09_yield_from.pyc            | Bin 0 -> 864 bytes
 test/bytecode_3.4/09_yield_from.pyc            | Bin 0 -> 593 bytes
 test/simple_source/expression/09_yield_from.py |   3 +++
 uncompyle6/semantics/customize3.py             |   6 +++---
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 test/bytecode_3.3/09_yield_from.pyc
 create mode 100644 test/bytecode_3.4/09_yield_from.pyc

diff --git a/test/bytecode_3.3/09_yield_from.pyc b/test/bytecode_3.3/09_yield_from.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f561e363427142e43b923f65ae4c8e3dfcc59f8a
GIT binary patch
literal 864
zcmbVK!A=`75S__FX&@=wqMm!`R+WGgYNZNsK!RRYsv?yN30d2<gSKqg)Vmf$3a4=A
z5Bd@P!oKGSB{@=S_xa6uJbp9wpI(3a)BC~I-;PKjD<c6v!QXrY*jHkKDvv6cDz+mw
zkw=kBkPWe$ktYlrrdx<FxSNCX27ab)-U3>YS<Ez3nX8^6?YRPmDFjFs7;J6nQw0fK
zfVs=78$%b91p<t)$$3;(Zn*^>NeSTtpee_b%9*APzHkTbe&Suzl=bbw;b$`~U1iP4
z*W>-kbp4baZlxB{^@W0pI5;yP*3<_<K`V7|Ig2tDHPF6Z*kCW!#(qqHhU+(&pJhG!
ziYOBcbZp~~iq1jMT!@;hJROPN@6-4Nkyr2Jp(C@7%tam&nc>DnZo1+J<lpu8K=55$
z!29h7U>GaN;?*qLoVR%-S$*qL9viL3Rii+KUt8z%7EL}2xwnB&p={mQyHSiI|L;z`
zMlxfN!W+Yv)UaaFzV2yPdm2{Pv!ymFUBAdEg*{!{veXsX3!e}V|1z#^sN8XULF~<L
H(%bn5Yr(D$

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.4/09_yield_from.pyc b/test/bytecode_3.4/09_yield_from.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d2809716e99506447611876989db10ac4c926fc7
GIT binary patch
literal 593
zcmYjOO-sW-5S>ZV?+?8d&mJTQttU|s@gP_)1re+i$`Z5N5}TO1n_>&?slEF<y!vx;
z_3jVw<jjhYB{TDO*nRun<h$9bpB;6^pANtm6qZZ)iozUIlJp@+2X+V}!Y)V;b^s%4
zmOz#*cKF!6Um1jamls!$BBU?}lrn&|rCK9w5wGb&AMGt?kb6=_+Q+;m-hy~0c;n_S
zmAoV;QLHo)!w2XRl^@?k$vjrVqzfIYo?6beGA2r2dMD>%6{%Q?iB6O5e5J`5G$;%M
zK)Vl_ix*e!TZt_Kq^}?g2lhEqg;R_EQkf3s-s)*FZ4>$@t}>5(gaG@lbA!V4DUoI3
z-Xgr80xr9}d8W6<hp=&A?Z6gb<HDLo3oxsJ?l6A9*ACD(98&l0(T)lSB*&9M7WiK7
z85K`P?b}T0AS3%Xi$Ke~5@jmUYLa^v@Wcwjt3ps)3&Fp{ut>lb?qdy`sCfpyYlo!S
akZlyKTQ2LrdXc1Z5vxl(T=u)?HXFYmuWO<J

literal 0
HcmV?d00001

diff --git a/test/simple_source/expression/09_yield_from.py b/test/simple_source/expression/09_yield_from.py
index a6dfebc9..e8d5eb20 100644
--- a/test/simple_source/expression/09_yield_from.py
+++ b/test/simple_source/expression/09_yield_from.py
@@ -11,6 +11,9 @@
 def _walk_dir(dir, dfile, ddir=None):
     yield from _walk_dir(dir, ddir=dfile)
 
+def ybug(g):
+    yield from g
+
 # From 3.5.1 _wakrefset.py
 #
 #  3.5:
diff --git a/uncompyle6/semantics/customize3.py b/uncompyle6/semantics/customize3.py
index 1a02056c..228766c1 100644
--- a/uncompyle6/semantics/customize3.py
+++ b/uncompyle6/semantics/customize3.py
@@ -193,12 +193,12 @@ def customize_for_version3(self, version):
         def n_yield_from(node):
             self.write('yield from')
             self.write(' ')
-            if 3.3 <= self.version <= 3.4:
+            if 3.3 == self.version:
                 self.preorder(node[0][0][0][0])
-            elif self.version >= 3.5:
+            elif self.version >= 3.4:
                 self.preorder(node[0])
             else:
-                assert False, "dunno about this python version"
+                assert False, "dunno how ths Python handles 'yield from'"
             self.prune() # stop recursing
         self.n_yield_from = n_yield_from