From beac1d3567741f8723d30015feb17dcd4369e685 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Tue, 21 Jan 2020 04:37:58 -0500
Subject: [PATCH] Fix a bug in 3.6+ keyword-only argument passing

---
 test/bytecode_3.6_run/02_call_ex_kw.pyc   | Bin 1731 -> 1954 bytes
 test/bytecode_3.7_run/02_call_ex_kw.pyc   | Bin 1735 -> 1936 bytes
 test/simple_source/bug36/02_call_ex_kw.py |   6 ++++++
 test/stdlib/3.6-exclude.sh                |   1 -
 test/stdlib/3.7-exclude.sh                |   1 -
 uncompyle6/semantics/customize36.py       |   2 +-
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/bytecode_3.6_run/02_call_ex_kw.pyc b/test/bytecode_3.6_run/02_call_ex_kw.pyc
index 5f8d4607fea25841a32549384b69362e9934d76a..36606412d805dc0129ccb85cafeefd211ec48a28 100644
GIT binary patch
delta 353
zcmX@iyNF-en3tC;^r%|g26hI9#|%gS$Y*c>;$nx1%3+MU6RVUN^(M|!X4Ic}NSV=K
z;<HLd!^sJZ&fG>(Tq(v;+^LKyCX?4ON;8^HKE+t7shOhH!Vo2xVv#DCVwqw!k10hb
zMLUzRk1?BR0#mU~32PH$icBzrruF0iX0gptOo7bx$&66jnSnG2`-5zk01`C}B@8u;
z&5Yt8nkkF1nE}KG>SpxQWV*#%T$+1}tt>I8G__chIf|nozc@azDBbWDGmwm8%`OL0
zMIiGa1S^nriyNpYKQE^;9;nwEWDOI8Adq4#QU{VRSwKn{O(w5q^-(Dj0*SDJ2reL@
o$yme#qL_+6>cNtlLX&^8X0U*CPEKG`W^|a`!e-AR!@|J?03G*D5&!@I

delta 123
zcmZ3)f0$R<n3tDJsPKR6J~jr1#|%h-9msY7;$oSJ%3+L}6RVUNwI<F}X4IZ|NSRS*
z;<HLd-N^}z&fI!YTq*id+^LKy29wt@N;4WxKE+tdDih40X|y?mDV=$8Jev=brr_lB
RY#Ebn*p(P<Cdaee0|22x9bW(d

diff --git a/test/bytecode_3.7_run/02_call_ex_kw.pyc b/test/bytecode_3.7_run/02_call_ex_kw.pyc
index c9ad7a7b949c12c1dc20d045225f3b72f1e7b257..f04f5096627ceb24015b1b72f63a8cb27c7c5eb7 100644
GIT binary patch
delta 315
zcmX@kJAt3iiI<m)0SH2ms>N+!pU5Y{=rB<|jL~pnoid}*#6`-C#uJYzGn!0%bzIgo
zm9394g&PR@Qk3T~XERM;EM8E;+QgX3l43Ub9AlYAicSkdlwgW(s$hzFiqbr$6ulJv
zOvXM&pi-t{8<5fzgJ1?ti_IQPwaoR&j3A4FfEkEcfY=|1izR?W4MPb-4P!H-IEZFi
zz_^eB#0KhQ^wVUz#avvPdyB0sF{d=OSd%%5qaeRHKCvj>@D?+WjAG3$2U0~KGa&>k
zkade2s3<=#r!pR>*BWFE6N4C#Vk}Yzk}p9aaEsC8CCCwzkFuI`Fc$FunVLeA|FUMV
WfRs#5VN+&wnB2i;&mzOZ!2|%o<V!RF

delta 117
zcmbQhf1H=kiI<m)0SNMo{>ScPo5&}@C^Jz#j8SJ|oid~D#6`-CdJ~T+GwM%#bzIgU
zm9394g&PR@Qk3T~XERM;EM8E;+QgX3l43ad9Ag<vFoUMi<{YM4=E-$z=8S@q_p)U$
UGEZK}B0SlSosZFGvM;+m0DzJpasU7T

diff --git a/test/simple_source/bug36/02_call_ex_kw.py b/test/simple_source/bug36/02_call_ex_kw.py
index 000c40f9..0ca044b3 100644
--- a/test/simple_source/bug36/02_call_ex_kw.py
+++ b/test/simple_source/bug36/02_call_ex_kw.py
@@ -53,3 +53,9 @@ from collections import namedtuple
 Point = namedtuple('Point', 'x y')
 p = Point(11, 22)
 assert p == Point(**dict(x=11, y=22))
+
+# From 3.7 test/test_keywordonlyarg.py
+# Bug was in handling {"4":4} as a dictionary needing **
+def posonly_sum(pos_arg1, *arg, **kwarg):
+    return pos_arg1 + sum(arg) + sum(kwarg.values())
+assert 1+2+3+4 == posonly_sum(1,*(2,3),**{"4":4})
diff --git a/test/stdlib/3.6-exclude.sh b/test/stdlib/3.6-exclude.sh
index 37dd3951..ad1d82e6 100644
--- a/test/stdlib/3.6-exclude.sh
+++ b/test/stdlib/3.6-exclude.sh
@@ -88,7 +88,6 @@ SKIP_TESTS=(
     [test_inspect.py]=1 # Syntax error Investigate
     [test_itertools.py]=1 #
 
-    [test_keywordonlyarg.py]=1 # Investigate
     [test_kqueue.py]=1 # it fails on its own
 
     [test_lib2to3.py]=1 # it fails on its own
diff --git a/test/stdlib/3.7-exclude.sh b/test/stdlib/3.7-exclude.sh
index ad050082..231a9dca 100644
--- a/test/stdlib/3.7-exclude.sh
+++ b/test/stdlib/3.7-exclude.sh
@@ -54,7 +54,6 @@ SKIP_TESTS=(
     [test_index.py]=1  # parse error
     [test_inspect.py]=1 # test failures
     [test_itertools.py]=1 # parse error
-    [test_keywordonlyarg.py]=1 # Investigate: parameter handling
     [test_kqueue.py]=1 # it fails on its own
     [test_lib2to3.py]=1 # it fails on its own
     [test_long.py]=1 # investigate
diff --git a/uncompyle6/semantics/customize36.py b/uncompyle6/semantics/customize36.py
index 8715da98..84b356d8 100644
--- a/uncompyle6/semantics/customize36.py
+++ b/uncompyle6/semantics/customize36.py
@@ -188,7 +188,7 @@ def customize_for_version36(self, version):
         self.write(', ')
 
         kwargs = node[2]
-        if kwargs == 'expr':
+        if kwargs == 'expr' and kwargs[0] != "dict":
             kwargs = kwargs[0]
         if kwargs == 'dict':
             self.call36_dict(kwargs)