From 5cdf057a4734e89faa96b307182033b7502c1a40 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Wed, 15 Jan 2020 02:36:19 -0500
Subject: [PATCH] Correct handling "if" in dictcomp in semantic actions for 3.x

---
 test/bytecode_3.1_run/05_dict_comp.pyc        | Bin 599 -> 1042 bytes
 test/bytecode_3.5_run/05_dict_comp.pyc        | Bin 461 -> 822 bytes
 .../comprehension/05_dict_comp.py             |  22 ++++++++++++++----
 test/stdlib/3.3-exclude.sh                    |   1 -
 test/stdlib/3.4-exclude.sh                    |   1 -
 test/stdlib/3.5-exclude.sh                    |   1 -
 test/stdlib/3.6-exclude.sh                    |   1 -
 test/stdlib/3.7-exclude.sh                    |   1 -
 test/stdlib/runtests.sh                       |   2 +-
 uncompyle6/semantics/pysource.py              |   2 +-
 10 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/test/bytecode_3.1_run/05_dict_comp.pyc b/test/bytecode_3.1_run/05_dict_comp.pyc
index 17657f4ada7565d88fce67f3b42c76d863adfad3..644ed11af97c336e1bd6d33f628ceb0247511fd7 100644
GIT binary patch
delta 485
zcmZWk%Sr=55UiQq>?7uZB0*3jpn+Tz^e}i5Q7@i?1TR9AkXdCB63u3B2?6y7lEs4`
z;?>{q;3+>MR<8#IXR2#@nwshA4|g6+TcvVw@xFQ0!=L3cKVl@WBnvzPmq5gP8BYo^
zaHo;%V5AW_uv&`5qk?rr9J#QrR8B=*ge?e+^*|WwgD^IL4GwvRAdID~$YTkFu_X}3
zmO&U>0b!)+i!_x+RkWKcv$HQx(_@INr7otDLZxE=`eralD@@u^RF9J+jp|!_X1}LI
z!sRduj1xw3K;lqiptFmK!YH3w{CCzd(HJX?wah%MNy2O9;Gu>Gk0#_t&ImLslBV+O
zu-m_lW{d7|m6znlVXk2ps`DpOjm1VReq(tSdqTcYAQY0aH`P#u>{B&X^RMrRaewsN
SWUkLQ)+h`8ZKtOEfBPG96iCki

delta 143
zcmbQlah=7}pNE(0CksP#G6ND|2C^N1xL6fPq%bhFFfc?hFr)(6EDX(z44DiJ*-Q+@
ziVP)83{8v-DNGE(8mtrd{^MW)D(7V6WSo4EF;o!5VPIrqECn&*)AI8tyD_UWGEdH7
YR%O)y$xXh<Xg&EUvmhH2ki*Fa01#OgjsO4v

diff --git a/test/bytecode_3.5_run/05_dict_comp.pyc b/test/bytecode_3.5_run/05_dict_comp.pyc
index 4734945d819d2dfff79aeb3cf2a169db5b8da845..08c140607b4eadbed5b4a5512f005d2f615af08d 100644
GIT binary patch
literal 822
zcmZWm&2G~`5dPLqoWxC1B4_|1p-S{(RdNFoh(i>CDA!zaLli6WF4Q!M(_IHjm0o}s
zK!}IvOYk7RAx`@WJu$OQpn(0&?CfZMzrERNg+IREeRbOde&WivMfMXC^No}w2z&-!
z0E+DE_#}`4M;=TMg@E!PE9@kE6p&TOfa8@9S!3ruiL5&`APJ$v1|*^B(1Iki9X25e
z*Bm;K9b}<v_Jx~q10SR4Mk;7F{`jN?@QlQCNYS*?;{ld%tw)hR{2lF6K!s$)(J?97
zgyIf%@Y2JXz?p}oz+1OAjco!fo#(5E<AC~#QY558Q;c<C-e<*O<d<IDE5%VM-kn1S
zRP$ojWYhUXB_?0!RPCktbgtE*nwc!0?e!ieGE0kuz483RMcC&n-v*p)c$o%Hw@%{z
zBu~c^Gl>60xcWSWan_}(QAR0Fs_SeB9kQ#Eyw3CCX?vv9c4o{%ZQr~9=)qrHaE@c{
zF&Qf^VkV+kQ?P$<XT=IJL65GxYf5|^cUP=f?nh%)^?3G1MZRX9H50A5!#}g?I{7w9
zR=c{pZj!^2!19w?ronO<%VjK=vCNO<Z7o-@4N~Wx-k@U`34M#ssB*b_`>8QX7sU5-
pt#e&g=Q^7ex<w&ZhT(eJu~+X;bGewPfg_PCHETP5R|Nn4zX1FnlNta3

delta 171
zcmdnSc9uCnoR^pDCksRLGX@5R$3P4R%s`d{5Ep9zi4-7WWN2Yvh+<$!1+rNgni&}~
z85pve7>ZRGN*EcM7#UKS8G<$0Chon(!2;C5$;in#c`l=c6^O$C<P>oM>02!EY5Dnn
uE18P8fjmD=#v&ddt;qzD<Z~=8PAw|Q%+GTzD#|aK{GCaejR`2v!v+9fC?4AY

diff --git a/test/simple_source/comprehension/05_dict_comp.py b/test/simple_source/comprehension/05_dict_comp.py
index 12b103ee..bf21b795 100644
--- a/test/simple_source/comprehension/05_dict_comp.py
+++ b/test/simple_source/comprehension/05_dict_comp.py
@@ -3,12 +3,24 @@
 #
 # This code is RUNNABLE!
 def x(s):
-    return {k: v
-            for (k, v) in s
-            if not k.startswith('_')
-    }
+    return {k: v for (k, v) in s if not k.startswith("_")}
+
 
 # Yes, the print() is funny. This is
 # to test though a 2-arg assert where
 # the 2nd argument is not a string.
-assert x((('_foo', None),)) == {}, print("See issue #162")
+assert x((("_foo", None),)) == {}, print("See issue #162")
+
+# From 3.7 test_dictcomps.py
+assert {k: v for k in range(10) for v in range(10) if k == v} == {
+    0: 0,
+    1: 1,
+    2: 2,
+    3: 3,
+    4: 4,
+    5: 5,
+    6: 6,
+    7: 7,
+    8: 8,
+    9: 9,
+}
diff --git a/test/stdlib/3.3-exclude.sh b/test/stdlib/3.3-exclude.sh
index 617d58e5..06fc914e 100644
--- a/test/stdlib/3.3-exclude.sh
+++ b/test/stdlib/3.3-exclude.sh
@@ -5,7 +5,6 @@ SKIP_TESTS=(
     [test_concurrent_futures.py]=1  # too long?
     [test_decimal.py]=1 # test takes too long to run: 18 seconds
     [test_descr.py]=1  # test assertion errors
-    [test_dictcomps.py]=1  # test assertion errors
     [test_doctest.py]=1  # test assertion errors
     [test_doctest2.py]=1  # test assertion errors
     [test_dis.py]=1   # We change line numbers - duh!
diff --git a/test/stdlib/3.4-exclude.sh b/test/stdlib/3.4-exclude.sh
index 46819678..16297a24 100644
--- a/test/stdlib/3.4-exclude.sh
+++ b/test/stdlib/3.4-exclude.sh
@@ -21,7 +21,6 @@ SKIP_TESTS=(
     [test_decimal.py]=1 # test takes too long to run: 18 seconds
     [test_devpoll.py]=1 # it fails on its own
     [test_descr.py]=1   # Doesn't terminate
-    [test_dictcomps.py]=1 # test assertion failure
     [test_dict.py]=1   #
     [test_dis.py]=1   # We change line numbers - duh!
     [test_distutils.py]=1 # it fails on its own
diff --git a/test/stdlib/3.5-exclude.sh b/test/stdlib/3.5-exclude.sh
index 05147d78..e88b0e41 100644
--- a/test/stdlib/3.5-exclude.sh
+++ b/test/stdlib/3.5-exclude.sh
@@ -32,7 +32,6 @@ SKIP_TESTS=(
 
     [test_devpoll.py]=1 # it fails on its own
     [test_dict.py]=1   #
-    [test_dictcomps.py]=1 # test assertion failure
     [test_dis.py]=1   # We change line numbers - duh!
     [test_distutils.py]=1 # it fails on its own
     [test_dbm_gnu.py]=1   # Doesn't terminate
diff --git a/test/stdlib/3.6-exclude.sh b/test/stdlib/3.6-exclude.sh
index ccd67776..0d041593 100644
--- a/test/stdlib/3.6-exclude.sh
+++ b/test/stdlib/3.6-exclude.sh
@@ -51,7 +51,6 @@ SKIP_TESTS=(
     [test_descr.py]=1   # syntax error: Investigate
     [test_devpoll.py]=1 # it fails on its own
     [test_dict.py]=1 # it fails on its own
-    [test_dictcomps.py]=1   # We change line numbers - duh!
     [test_dis.py]=1   # We change line numbers - duh!
     [test_doctest2.py]=1  #
     [test_doctest.py]=1  #
diff --git a/test/stdlib/3.7-exclude.sh b/test/stdlib/3.7-exclude.sh
index 7581cdb7..16eaaaee 100644
--- a/test/stdlib/3.7-exclude.sh
+++ b/test/stdlib/3.7-exclude.sh
@@ -31,7 +31,6 @@ SKIP_TESTS=(
     [test_decimal.py]=1   # Parse error
     [test_descr.py]=1   # Parse error
     [test_devpoll.py]=1 # it fails on its own
-    [test_dictcomps.py]=1 # Bad semantics - Investigate
     [test_dis.py]=1   # We change line numbers - duh!
     [test_doctest2.py]=1 # assert failure
     [test_docxmlrpc.py]=1
diff --git a/test/stdlib/runtests.sh b/test/stdlib/runtests.sh
index 5a44a046..a0b26ca1 100755
--- a/test/stdlib/runtests.sh
+++ b/test/stdlib/runtests.sh
@@ -274,7 +274,7 @@ fi
 PYENV_ROOT=${PYENV_ROOT:-$HOME/.pyenv}
 pyenv_local=$(pyenv local)
 
-# pyenv version cleaning
+# pyenv version update
 for dir in ../ ../../ ; do
     cp -v .python-version $dir
 done
diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py
index aac4a9bd..54b243c7 100644
--- a/uncompyle6/semantics/pysource.py
+++ b/uncompyle6/semantics/pysource.py
@@ -1333,7 +1333,7 @@ class SourceWalker(GenericASTTraversal, object):
 
         if comp_store:
             self.preorder(comp_for)
-        elif if_node:
+        if if_node:
             self.write(" if ")
             if have_not:
                 self.write("not ")