From 6cbb631aa6a7724e9e26312ff2054e7624f9b574 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 9 Feb 2020 07:32:06 -0500
Subject: [PATCH] In lambda code we, no stinking bogus yield

---
 test/bytecode_3.0_run/05_block_fallback.pyc   | Bin 0 -> 1727 bytes
 test/bytecode_3.5_run/05_block_fallback.pyc   | Bin 0 -> 1501 bytes
 test/bytecode_3.7_run/05_block_fallback.pyc   | Bin 0 -> 1448 bytes
 test/simple_source/bug30/05_block_fallback.py |  32 ++++++++++++++++++
 test/stdlib/3.7-exclude.sh                    |   2 +-
 uncompyle6/semantics/make_function3.py        |   2 +-
 uncompyle6/semantics/make_function36.py       |   2 +-
 7 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 test/bytecode_3.0_run/05_block_fallback.pyc
 create mode 100644 test/bytecode_3.5_run/05_block_fallback.pyc
 create mode 100644 test/bytecode_3.7_run/05_block_fallback.pyc
 create mode 100644 test/simple_source/bug30/05_block_fallback.py

diff --git a/test/bytecode_3.0_run/05_block_fallback.pyc b/test/bytecode_3.0_run/05_block_fallback.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b2f9418a94b0d3ce390ae65d729d3650ad7706e2
GIT binary patch
literal 1727
zcmcIkOHUgy5T4y7&_vK4g4FglQV(6E2qINIwe$gks+U~gltZn3IAp<Dr)wLC1eelZ
z(R2S~Z=Layg_5>Xk!s0aujlo7W<I}KUF&@N@%B>&w?;twcQnm9EjhqffFXbcxB>|B
z01o1i1dYiO{qWqSX^v_6KsscThhWJjf=hr4Z+sb$Eb_7?e?+nnE<$#E8A0BHivUhm
zV7dZ<4d6>a;aXrxC4#F32@sHF3OC3YFc1Fn+@Wb6(?VhQ2=_3UUn7JY{Co)>{AH^H
znuagZs0{XF7PuBI`-w8rU)-^dk!s}6wH?bUrW5ds<JA<CsglBIS7mZ5bw@AyTm6?J
zRXRHnqeQ7R$xb$>Gq+00LS(wMNl_XhI&AE51%o)EANRm(l*vR2;aDuhMCXpYiv{Z%
zY^_A02(S?MMaEusX1mwO+Vtmfbpj9KM)LdIKO_BLazFHmr=}QEnL`-1cs;1E_?>e6
z(O{`9CU~6-S#>&iJr2i(!AvE_AZ-$y%4#Gtt7dqlb&iFVRgx-+abnO)V`Yx%tg%*w
zv2mJhZ1j-iXHqHt79~}!utj-<qe@Q}yf)?yo*t&o;_YJLHV$+taaze!Sy~D{mgtO2
zRAW7_HCkQcw1qAyxL0jllLu{erqw1MjuYEh7p6y9sV3AgvmW-@F3s>vJC!4QMs6c^
z&4J}-SDYq_fHd}cgh@Gz&$qYxIMNlK*B&Snd=*N7Bv8){`o5&BaV8q$Tyt`a-fT`5
zN^Q6+JYkrM%#=ahZk{xAmfW`k>(1xu3h`v#e?Yuo&i|DcE2JPqt~27uZ7-g<T(bYl
zoHdHR!%Ux(hYt*c?sS%ecH|Zm3X(z11y<APF}1gQNZa?u$clSruc~zA@%w(}+}<Ig
z<D_Sc&K*A|X?EW#bjg}Yb?5Qo6dQiMAnZo%p!=vDtW#-x;s0QAgTU|p?V;o{zOEm>
LH$FDss{QmQxI2`=

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.5_run/05_block_fallback.pyc b/test/bytecode_3.5_run/05_block_fallback.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..186cc2c0c22859b2cd41469ac6ad8b97b9966dd6
GIT binary patch
literal 1501
zcma)5O>Yx15cPf}ZC43MMQV%0!MA2n6e1OFZGl#RxI{?lDF>|maGIsgI<>uRQ?(b$
zui(suzqD6Q`~)~Lvzu(AP*ANM+w1Y089zU7Hk;npUoSsyxrF>63(bc4D=@tYT@0T^
zz7R4XgcEW@h!xwU?>iAViw1Clb_k{gbngHFdjJEy0gOYg3Arl3*A}=P61#=lEmpy8
zlPeozUxTYgt}Jr0Li7h>Eb<v*)rf%&4!J4UNAq<8b<}%RA&{C>wLgI$sCNKx=xsbi
zS<?VgH~@4nw++{Zg+fLrY#0a;2GL1p7k&ew_d5sELz$W&Np*xlvEgWe^}#eA8G`nG
zyZ81x@$KBzTnzJ?G$XDQZY#RqEuD-ff-@~M74c_bcD&Pl)_t*@cQVZzj777QjCq)&
zNNim`zh|MH#Q;6u%~u&qgE40;_ZS<?ID<ME<~hv*QF>HuUg>Sk3eT2%w+yV!i)mO2
z=XX=y0?!iVNH%cq6asSb+6Oi4`+n{6>HklK*D}9>;2ZGyUei<>8qgU@TzMXywWCp@
zX(R%zDNF)7;cCbuBc}9N%9tjGs~{AdwgOEtEstq9t<WOTrWHoM-=^R{=R)9^q;Qdm
zNz!9FRC4@R)CykJ)23l&=;9^NJ=&8grxV4`cxoW|h|^31`xSbwJZfZFr%7ZA$&0O3
zXow(<jHKw$qfuZgbfVk9iW-A_r)}CrTo}=FnTeQUWQwB3(3qH?X31F~ppXhLhcrm1
zt&6?AE*(lmFUknO1Rezl;84`Iro}4(){uz`97`le%TBctq3*Hah^Ensr-F~w>J=jM
zErrTn796M*FN(1(1kJR+bAOe9{7Zb#ud6yHSix=;x_pJPSVoK~d{_V0eDh#Yc1_r;
zF;K&+TMb7wVEPk`_)cDz;U`d7{@}INT;ZL)QA(=ZMKSqq@l0|nDlh{(jFu1k=#Fz?
qxf+uYd&60?HXg27>y}!F{~l0=<3bc<w|uCpyXDi~FYw4)<MAK93~P`8

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.7_run/05_block_fallback.pyc b/test/bytecode_3.7_run/05_block_fallback.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fd4692f7fe622fdf1372eb4b58bd05d2eeb8e68f
GIT binary patch
literal 1448
zcma)6O>Yx15VdzVX^0xAfJ2cu_|^nPAyPr&&=zRLmxOX@PdQ-iuAO$NvrcVq+f?a=
z_E&J`!e81eCw>B)nAs%Ts1#I7<FECb89%?-?M9<cpnd)I^3!TS$PZl1n+KCuVD>(A
zf(Uv^`b3foLW%HpNz0F6zi5CYXggr`BXsZJwD2zBoFf<hIhg?JoWiaz0@w{;?Vo!S
z4|aV~nb5-}`@+#LR8*Wd@h@=wzE~58Q|*<3z%?n;dI$?i`c#m<Hx1YKg%5z>Y|TmQ
zc%*cE$OoZPQ5YX~HeeYlyVcnq@95NpNor$sh7CswwhLzQDuRL|ulM#l^m$;V8sru2
z4x}-7tmu9>Z897w$*s;zET2Z%{(ARm_xbg>qjA2>c{~frIWlgG!1V0dEfei5I_R~6
zyvBJN4khP#o%5j<8RWq+&QTVs=@(O(XL^;h!Mo-4D+cb&lc`aI^P8!D3}3FO2AVzL
zgBk)6^eZ9&rYdJo{(lpEiaG1yH{kGtWvO;7WHVx<sn^-8?HweR#VWLx!6alOX$CTO
zYRvYv7A$engprc08Cr&6rC`yxM61NQW)!ztZ3f>@q*6F0DLh`{l60R9j2`~wwS<@X
zv{{rnwn#kNWIdfqHZt;9rVfH1NS0Y(yhP8{#+;t!=@Okn@ZxCc8a!yHW34)D?;vy~
zI<akF#SB5R<2LIeE{fTS&Xi#2nW2!;H3pVPS#lgINTkH;0SnV{^K^5w%Ldx8)2Rnw
z0<QuDNJwhUvZ6A8HDsa$3ytJh-6?ls)H*gC(JWd~9$1*PR|u;`4XXLN$Uvd^P@JzK
zXr}k|+p7d5KgIW2Ra3<POW4(*%a=G8I_BJ9E&W^PjqOF*HQ=m8N40uDYra{A=}$2D
zljT(%eFlZ)cVAm84ZhhMW3<Tw6jLiGN+YLnf$4iueEqTyZnzhwYcUA%R{SbmxmTsj
d)Zovw2bAHs;04*87H4f^TFzSq9(k)h`U3<aYajps

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug30/05_block_fallback.py b/test/simple_source/bug30/05_block_fallback.py
new file mode 100644
index 00000000..ed1c979c
--- /dev/null
+++ b/test/simple_source/bug30/05_block_fallback.py
@@ -0,0 +1,32 @@
+# Adapted from 3.7.6 test_contains
+# The bug was in reconstructing something equivalent to
+# "while False: yelid None" which is *needed* in __iter__().
+# Sheeh!
+
+# RUNNABLE!
+def test_block_fallback():
+    # blocking fallback with __contains__ = None
+    class ByContains(object):
+        def __contains__(self, other):
+            return False
+    c = ByContains()
+    class BlockContains(ByContains):
+        """Is not a container
+
+        This class is a perfectly good iterable (as tested by
+        list(bc)), as well as inheriting from a perfectly good
+        container, but __contains__ = None prevents the usual
+        fallback to iteration in the container protocol. That
+        is, normally, 0 in bc would fall back to the equivalent
+        of any(x==0 for x in bc), but here it's blocked from
+        doing so.
+        """
+        def __iter__(self):
+            while False:
+                yield None
+        __contains__ = None
+    bc = BlockContains()
+    assert not (0 in c)
+    assert not (0 in list(bc))
+
+test_block_fallback()
diff --git a/test/stdlib/3.7-exclude.sh b/test/stdlib/3.7-exclude.sh
index 52bff135..2b1f0c19 100644
--- a/test/stdlib/3.7-exclude.sh
+++ b/test/stdlib/3.7-exclude.sh
@@ -30,7 +30,7 @@ SKIP_TESTS=(
     [test_compileall.py]=1 # fails on its own
     [test_compile.py]=1  # Code introspects on co_consts in a non-decompilable way
     [test_concurrent_futures.py]=1 # too long
-    [test_coroutines.py]=1 # test
+    [test_coroutines.py]=1 # parse error
     [test_codecs.py]=1 # test assert failures; encoding/decoding stuff
     [test_ctypes.py]=1 # it fails on its own
     [test_curses.py]=1 # probably byte string not handled properly
diff --git a/uncompyle6/semantics/make_function3.py b/uncompyle6/semantics/make_function3.py
index 66bc6fa3..fd61e9a7 100644
--- a/uncompyle6/semantics/make_function3.py
+++ b/uncompyle6/semantics/make_function3.py
@@ -677,7 +677,7 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
     # add in "yield" just so that the compiler will mark
     # the GENERATOR bit of the function. See for example
     # Python 3.x's test_generator.py test program.
-    if code.co_flags & CO_GENERATOR:
+    if not is_lambda code.co_flags & CO_GENERATOR:
         need_bogus_yield = True
         for token in scanner_code._tokens:
             if token in ("YIELD_VALUE", "YIELD_FROM"):
diff --git a/uncompyle6/semantics/make_function36.py b/uncompyle6/semantics/make_function36.py
index f273f265..c696a508 100644
--- a/uncompyle6/semantics/make_function36.py
+++ b/uncompyle6/semantics/make_function36.py
@@ -356,7 +356,7 @@ def make_function36(self, node, is_lambda, nested=1, code_node=None):
     # add in "yield" just so that the compiler will mark
     # the GENERATOR bit of the function. See for example
     # Python 3.x's test_connection.py and test_contexlib_async test programs.
-    if code.co_flags & (CO_GENERATOR | CO_ASYNC_GENERATOR):
+    if not is_lambda and code.co_flags & (CO_GENERATOR | CO_ASYNC_GENERATOR):
         need_bogus_yield = True
         for token in scanner_code._tokens:
             if token == "YIELD_VALUE":