From c3d7ba6dad832afae99c03ff3c436ef1efdc8d16 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 11 Jan 2020 07:06:46 -0500
Subject: [PATCH] 3.7 "imports" and "or"

---
 test/bytecode_3.5_run/04_importlist.pyc    | Bin 397 -> 470 bytes
 test/bytecode_3.6_run/01_conditional.pyc   | Bin 337 -> 565 bytes
 test/bytecode_3.6_run/04_importlist.pyc    | Bin 354 -> 413 bytes
 test/bytecode_3.7_run/01_conditional.pyc   | Bin 0 -> 565 bytes
 test/bytecode_3.7_run/04_importlist.pyc    | Bin 364 -> 421 bytes
 test/bytecode_3.8_run/01_conditional.pyc   | Bin 0 -> 577 bytes
 test/bytecode_3.8_run/04_importlist.pyc    | Bin 368 -> 425 bytes
 test/simple_source/bug35/04_importlist.py  |   7 ++++--
 test/simple_source/bug36/01_conditional.py |  11 +++++++++
 test/stdlib/runtests.sh                    |   1 -
 uncompyle6/parsers/parse37.py              |   1 +
 uncompyle6/parsers/reducecheck/or_check.py |  18 +++++++-------
 uncompyle6/semantics/transform.py          |  26 +++++++++++++++++++++
 13 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 test/bytecode_3.7_run/01_conditional.pyc
 create mode 100644 test/bytecode_3.8_run/01_conditional.pyc

diff --git a/test/bytecode_3.5_run/04_importlist.pyc b/test/bytecode_3.5_run/04_importlist.pyc
index 6d739fe7e562923f83f37298f7999b01f39bcae3..96a13e107089873f952e350664aae3439023d0ab 100644
GIT binary patch
literal 470
zcmY*VyH3ME5S%+ZvGY#BLx`3pO@ah;2th$hLuVl($2q{^oHMshk%ER)`~kl}O+l9r
zxt5AwpkfU~3b%Ko-PxVd>b6_0x?JvDF9q;{wc~Mq%8%X|#(V`dFcFC4Pbr~2WIiGv
zqHKH66=YRJRb&C8;Fo1lh^Pi7F{xwhV<Aesm!K;Y4Lk{`CX^4=!h*?%6<Gy6uJQo%
zyvl2sv_UU_<-fhyN`T&0ErH8k<&&4kMNhae*Ku)UY}S*`Bb7UU8fVIhxYvmSL;XB1
z?wns@<Qd9&W=>YJ*hxdS{0!@tRVOi8tE5QHl=|@~ag8;?g`=3%k8%5qNZE4i+*)H@
zJ*9L?MLbOudl%MuEPjRUmd+)7?NOTLS`Ep}Y@!CE+3ms6VE=H)tg(eosp#i(7anJ3
aJk#nVU=3|BbVOHdiKg6@o1)3l;rIp`u5kze

delta 286
zcmYjMyKcfz3_ZR#34!Jc2HMVySvq&@L^l>BhC3hyh*U*Mh+>wqRB9!p4orLnJKw^P
zm5IN=0V3g-&hfD&`>412=hc|bVdziS1f1|-O7MpyZ>20G2q};dth!Q#R3j5gpjy^Q
z9b_)7i_C-dZe3Yw!TN|5k~S6&{s=t5s)JubOvriG5Eq;`*aNQ{>?3&s|KF*cF%I3c
z+=Nj`l~Y8kuTWK*<Dzo%D2pqK!oaqc{8me4{f5;`E@b4JcLVw~I-1S*D2*tk*=^{(
Q-xJuS9=%YYo+-Hc1sWtYzyJUM

diff --git a/test/bytecode_3.6_run/01_conditional.pyc b/test/bytecode_3.6_run/01_conditional.pyc
index c24dde9c03272c3e09455a2b740b86896aa00a59..1738b0288b0e607fb8f750d099e24c2898a5fc6d 100644
GIT binary patch
delta 303
zcmcb}w3S8Kn3tDp+Dgf|LyQazj~S2vGmz~7#KkQWl}$rZ*jgB(m{OTi*i+b>nNm2i
znTowi7@HWuBAh@GE}%#ZRD=_(1|*UP7lEm10Ewh<2Qz5$OpMu3pUecc5@a3F2@K94
zD@A}r4MQ<U4Py~c3S%Bq3R5jp4HHlgv)@ag6hje6R}n~yCi5-E#9NF>QEa)Hc{!<h
zU_l7M3Y5OZR#cpmnViZ8WEZml2?j<1pqW704QvKyND(KH<EP0ynV(UN1tc+9g;7~V
U0Lb8A;bG)s<YVDr5n=>E0K14apa1{>

delta 91
zcmdnWa*;{dn3tEUt4J(vCj$e+V<3hDCLqfJh>J}oDx0zdGib6+T(d#KPm`&L4Jdkx
g&#|~TwWuUBKhL$OD8Fd(KSpIPkOT({4<jEV07se<_y7O^

diff --git a/test/bytecode_3.6_run/04_importlist.pyc b/test/bytecode_3.6_run/04_importlist.pyc
index 6e5471a08eb843bd3fa86a64894a03e5417ccf7d..3b697c2cb76295b21e7a444a8bb1c217ac20ca70 100644
GIT binary patch
literal 413
zcmYjMJx{|h5cN53lct|SEbJ^<TBO2;P#IXeATeZU<tB!v*m2}@hcYnGU&Ej15An*x
zUtq${fbhxh-aXyDv**KMN>3N76A<!6{+-D4g}?ajp(G_pvV)v@MrEW}&LF6f?5J+u
zRdF7-HOM6I3A#&5c7&3>Qe4>n2Z(`SVtAyuY^yFlwK>LBn|r$vZUg(<0|M}^Rp60i
zop1jJvdq9GjpX)O8<kNPp=cbdxe^X|HqK*>(}vrvV*&F>W8-@cXs91{RHF%hGAvZ%
zLQ5$MTj?67d{emoKfxs%j-oXl-6IMU+8&J2#-$ZjHCkR5!h2ieB0u~|%p^Dm__@SN
zHBzim?@b|QoBhlDW_ESG_Nq2kR%oZq!6mm!mwPGhVn2iD9#R;<1QL2iN09hPef$Ex
CN^iUX

delta 242
zcmbQs{D`UEn3tDpiyKE=6(a+~V+JI^1Y|n^ad8rmNMT4}%wfo4jA8<^m~xnN8KW2(
zL88n#EV-;vthsDaY+ycP4to?wDpM9`3QIF%u}ukA6Jsi4u?v`HE%pJ^Y{em9nj?$5
z*f|cwOkoUW&}4lHw1~k^lkpZyL1IaUCetnE;?#m$EP08!skaytHF=`g^NaOBQbi!Q
yMKR|W7XX!17EgTP&dZ#bl)RFmh!-eP#5>uS(LzK3$mC+=VH9BGVB%xs07C%W5j0x>

diff --git a/test/bytecode_3.7_run/01_conditional.pyc b/test/bytecode_3.7_run/01_conditional.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..71af35bde8ab961c0a9aa7bbbc172d1e40536f42
GIT binary patch
literal 565
zcmYjNO;5r=5Z&1pC|`yc4w`uI;(^47#>A5`sF5QVIT#KgbXQX;Et!RbrX)uE4gLrI
zhCicMPyGv?oY{ann|*zqee?RZSJi4sP<^a+`=21h7r$)EA=094UI~;?@Gg2n3niCe
z>N9u);?5Fqf6ZOuhs;$@<w+~GR0UO7O685EX<HR{iqt7l=Wg98S`BxeemfgYV*Sdu
zqEYcFpDjtq`<k}dBS<LQIEQt5%9g;oaw4hR1tdUoxlT49O~%vR_DVEl3Q@28qA?zr
z83sxtU(~|)fe9wlP!CKzM_)Hb^T*S(=JCnEk0TY#f;bw6N7Lujd5B||h75y%9l$(W
z@F%i9!##n|8M)Y=k8IvLkwh3T0jwyXoN^%(NjaTPMn?j9%7$q;DGXB>_41P-3U%}s
z6LX|V^Jv1r*IUHbIcnrdZ*A+*#Uk-e!?D@YtxIDx@)d3nW3<A5j`kN=Tkm`lt9hs|
S>;-G&;kgx{<$CTm@cIF>+iw~G

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.7_run/04_importlist.pyc b/test/bytecode_3.7_run/04_importlist.pyc
index 9f0bc568d7503ad5737ecceeec897fa84f8c5a63..3d9dd109682808c7ea40c3e9cd4fc508cdc8c342 100644
GIT binary patch
delta 288
zcmX|5F;2rk5WL;H*p9K|2vLv*(Ym3gPD6o&kkX(lB98bF33s;Ty@m#)@PddBKtaJL
z@&aCPKS1IUoL#Uh?ab`#YWEjEc|Oncl!d_kY`Nd%vzKiU6|2B73lgE{Xt)(p44j*h
zjbvnF84nsvBF7rv(@K0mB_5IH?qCZ#(?aL3NY{gk=w`r}ZU-E1Cba3<|0MvXfu7xE
z--HD#M?d{rS0(tQHOk#Loh{LG(ybS@vf6_x3mG?b)++blMPDUvs0}ku)L~fOeP5iU
rYg*UjRK3!{aGmGsZuP~wBKTeLb_(amM}cOL!4wia#0exJ)1dzVA$Uf&

delta 231
zcmW-aI|>3Z5QZ~J_Tid<h>a(ZZLF=g5iBeen-s!o7JTgLvSVYT=ncdRXkp=%as$D_
zBbd!h@qIu4z`WR(%0$YD*g37`{Bo1s^U4NIG~}cJMWJ?@Gwa}-<-G8eSNO_z8S+4d
z8GSS~e}d*)ipe3mLIyZ;^l;+nqjC&4P1Ln%n3CB0)W63u7+$7_RZLBfVOAQxON-1v
v8VeQdv0rx;wU>(Ru`~>ic>4_{OBc&Gse~;mai77U)3Pc+Knp_JhS2RF>#Q{C

diff --git a/test/bytecode_3.8_run/01_conditional.pyc b/test/bytecode_3.8_run/01_conditional.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1076f1b479040eb38e771463d2770e131e4c5cb6
GIT binary patch
literal 577
zcmYjNy-or_5Z>84;P^AdP-tRdV?km>V`60t#z;vcCWZop+tr*LcVrd{&5;=K8GHv`
z!^gPRidV35W&_A<X71a$Z@&F@@5|+ap!izscfUc1AKq+-Lz@Prd8eX;f=|&AS|~XO
zQ=PyE5O(H(hb!z7K4z>kDob3crOK(?Tq<uUP1CZtlc!FBIuEN(-g3C}vgxcjiPbCK
ziCW1gkDHK$IBzJ;0hNUO4KrA!uWSgcDkqZ4ok0RLn`te3#96XJySWfGnL^YlzG;km
zW`cpz$d|R{_s9gJaj1JHo}#bogX#16Mg8=w=f{x>CP5ta!;|rA>O94<OGAc>fIYx0
zOYjlPE|*6tK6_jTAHlz^=PH3j7%u@VDIl+MCKE|soz{{EkSDF7nv+65g+V7f3ZhU)
z|5h<WoHUCj41B#qc;%%+nzU<LjW*^9w`z{{m+o8}qmi$1ix{INZYkPlu(ICeC|1)@
TU)f7mNW*hWK+E;qUEuWxtc-6h

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.8_run/04_importlist.pyc b/test/bytecode_3.8_run/04_importlist.pyc
index 2b22411a08dda5c81c053cd29f2327826f8bb70f..1b22d3e51ac0d349d228f7ea4e4209897d218ea3 100644
GIT binary patch
delta 288
zcmX|5u};G<5cQqiBn@#>AqE&=V#&hH%))?#Dj_7~0bv>=TH++id0_#md_lzzz}TPY
zH!%AT*!YAx8Mu?~y?5_UcYnCy@>a@}g~096{dO&n-&aADtb~eLPzXK8id&(?z<D*Y
zk&0}r;z2`|sIkGXv=rY^iWj5{x3>b58DZoH(ri!>-3=Ji!+_)EgqA(~zXZSx(3`vJ
zn{dO5(Qp6ObpbwUEA5_|&KBr7nbwP1TjN0&xr!S)Yqfj!qOXcK)P|W?>M$&?e=bkb
q1ubfFx}KY0xXyF^INz`?4}O<_p2GRzL7*9AFogv7aRN!mH0T{g2}a%k

delta 231
zcmW-aI|>3Z5QZ~J_Tid<h^@73V{L6CSXd|)rVv)M;A2;poo#Fsy@7ZEExl51U}xb0
z%x0$ezMp?!-t0@|T*`>pIdA3idY9eH#s*C^WF!Ygp>~=v>)@PaJol8B`^tA2vOt9?
zeKs_If#!RP!z#K#3OIK3aO&uzatwD()U|1tk=Xmxzb7#mUL@5frl!X*Eet;-d1@eu
ug$j<?ue*}kOT~^@7=|aj|3;D}tM!|d!WN}?EMU-SSrs6l1tD!i==Ki?0W}Z+

diff --git a/test/simple_source/bug35/04_importlist.py b/test/simple_source/bug35/04_importlist.py
index ad51f661..5afc8a45 100644
--- a/test/simple_source/bug35/04_importlist.py
+++ b/test/simple_source/bug35/04_importlist.py
@@ -5,12 +5,15 @@
 
 # RUNNABLE!
 import os.path as osp
-from sys import path
+from sys import platform
 from os import sep, name
 import collections.abc
 
 assert osp.basename("a") == "a"
-assert path
+
+assert isinstance(platform, str)
 assert sep
 assert name
 assert collections.abc
+import os.path as path
+assert path
diff --git a/test/simple_source/bug36/01_conditional.py b/test/simple_source/bug36/01_conditional.py
index a521c98b..b643af49 100644
--- a/test/simple_source/bug36/01_conditional.py
+++ b/test/simple_source/bug36/01_conditional.py
@@ -8,3 +8,14 @@ def foo(n):
 assert foo(95)
 assert not foo(94)
 assert not foo(96)
+
+# from test_buffer.py
+# Bug was handling "or" inside a conditional
+def rslice(a, b):
+    minlen = 0 if a or b else 1
+    return minlen
+
+assert rslice(False, False) == 1
+assert rslice(False, True) == 0
+assert rslice(True, False) == 0
+assert rslice(True, True) == 0
diff --git a/test/stdlib/runtests.sh b/test/stdlib/runtests.sh
index 36526205..1e86cfe1 100755
--- a/test/stdlib/runtests.sh
+++ b/test/stdlib/runtests.sh
@@ -454,7 +454,6 @@ case $PYVERSION in
 	    [test_compare.py]=1 # test assert fail - investigate
 	    [test_compile.py]=1
 	    [test_configparser.py]=1
-	    [test_contextlib_async.py]=1 # Investigate
 	    [test_context.py]=1
 	    [test_coroutines.py]=1 # Parse error
 	    [test_crypt.py]=1 # Parse error
diff --git a/uncompyle6/parsers/parse37.py b/uncompyle6/parsers/parse37.py
index 5184d7bf..49e4d20d 100644
--- a/uncompyle6/parsers/parse37.py
+++ b/uncompyle6/parsers/parse37.py
@@ -913,6 +913,7 @@ class Python37Parser(Python37BaseParser):
         or        ::= and jitop_come_from expr COME_FROM
         or        ::= expr JUMP_IF_TRUE_OR_POP expr COME_FROM
         or        ::= expr JUMP_IF_TRUE expr COME_FROM
+        or        ::= expr POP_JUMP_IF_TRUE expr POP_JUMP_IF_FALSE COME_FROM
 
         testfalse_not_or   ::= expr jmp_false expr jmp_false COME_FROM
         testfalse_not_and ::= and jmp_true come_froms
diff --git a/uncompyle6/parsers/reducecheck/or_check.py b/uncompyle6/parsers/reducecheck/or_check.py
index ed12a798..218812b5 100644
--- a/uncompyle6/parsers/reducecheck/or_check.py
+++ b/uncompyle6/parsers/reducecheck/or_check.py
@@ -3,10 +3,7 @@
 
 def or_check(self, lhs, n, rule, ast, tokens, first, last):
     if rule == ("or", ("expr", "jmp_true", "expr")):
-        if tokens[last] in (
-                "LOAD_ASSERT",
-                "RAISE_VARARGS_1",
-        ):
+        if tokens[last] in ("LOAD_ASSERT", "RAISE_VARARGS_1",):
             return True
 
         # The following test is be the most accurate. It prevents "or" from being
@@ -16,7 +13,7 @@ def or_check(self, lhs, n, rule, ast, tokens, first, last):
         # The below then is useful until we get better control-flow analysis.
         # Note it is too hard in the scanner right nowto turn the LOAD_GLOBAL into
         # int LOAD_ASSERT, however in 3.9ish code generation does this by default.
-        load_global = tokens[last-1]
+        load_global = tokens[last - 1]
         if load_global == "LOAD_GLOBAL" and load_global.attr == "AssertionError":
             return True
 
@@ -24,11 +21,14 @@ def or_check(self, lhs, n, rule, ast, tokens, first, last):
         jmp_false = tokens[last]
         # If the jmp is backwards
         if jmp_false == "POP_JUMP_IF_FALSE":
-            if jmp_false.attr < jmp_false.off2int():
+            jmp_false_offset = jmp_false.off2int()
+            if jmp_false.attr < jmp_false_offset:
                 # For a backwards loop, well compare to the instruction *after*
                 # then POP_JUMP...
-                jmp_false = tokens[last+1]
-            return not (jmp_true_target == jmp_false.off2int() or
-                        jmp_true_target < tokens[first].off2int())
+                jmp_false = tokens[last + 1]
+            return not (
+                (jmp_false_offset <= jmp_true_target <= jmp_false_offset + 2)
+                or jmp_true_target < tokens[first].off2int()
+            )
 
     return False
diff --git a/uncompyle6/semantics/transform.py b/uncompyle6/semantics/transform.py
index 07ac9c2a..c61353ec 100644
--- a/uncompyle6/semantics/transform.py
+++ b/uncompyle6/semantics/transform.py
@@ -287,6 +287,32 @@ class TreeTransform(GenericASTTraversal, object):
 
     n_ifelsestmtc = n_ifelsestmtl = n_ifelsestmt
 
+    def n_import_from37(self, node):
+        importlist37 = node[3]
+        assert importlist37 == "importlist37"
+        if len(importlist37) == 1:
+            alias37 = importlist37[0]
+            store = alias37[1]
+            assert store == "store"
+            alias_name = store[0].attr
+            import_name_attr = node[2]
+            assert import_name_attr == "IMPORT_NAME_ATTR"
+            dotted_names = import_name_attr.attr.split(".")
+            if len(dotted_names) > 1:
+                # Simulate:
+                # Instead of
+                # import_from37 ::= LOAD_CONST LOAD_CONST IMPORT_NAME_ATTR importlist37 POP_TOP
+                # import_as37   ::= LOAD_CONST LOAD_CONST importlist37 store POP_TOP
+                # 'import_as37':     ( '%|import %c as %c\n', 2, -2),
+                assert dotted_names[-1] == alias_name
+                node = SyntaxTree("import_as37",
+                                  [node[0], node[1], import_name_attr, store, node[-1]])
+                node.transformed_by="n_import_from37"
+                pass
+            pass
+        return node
+
+
     def n_list_for(self, list_for_node):
         expr = list_for_node[0]
         if expr == "expr" and expr[0] == "get_iter":