From 716e097654ceccb60806a475df8374cc6325537b Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 5 Jan 2020 11:17:33 -0500
Subject: [PATCH] kwonly args in lambas for 3.3..3.5

---
 test/bytecode_3.3/02_pos_args.pyc-notyet | Bin 467 -> 0 bytes
 test/bytecode_3.3_run/02_pos_args.pyc    | Bin 0 -> 542 bytes
 test/bytecode_3.5_run/02_pos_args.pyc    | Bin 0 -> 414 bytes
 uncompyle6/semantics/customize37.py      |  13 +++++++++----
 uncompyle6/semantics/make_function3.py   |   6 +++++-
 5 files changed, 14 insertions(+), 5 deletions(-)
 delete mode 100644 test/bytecode_3.3/02_pos_args.pyc-notyet
 create mode 100644 test/bytecode_3.3_run/02_pos_args.pyc
 create mode 100644 test/bytecode_3.5_run/02_pos_args.pyc

diff --git a/test/bytecode_3.3/02_pos_args.pyc-notyet b/test/bytecode_3.3/02_pos_args.pyc-notyet
deleted file mode 100644
index a3aaed742082466050ebb3a0e4a7576403a5fee1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 467
zcmb_Y%c{aK5S>_G_(1#x-E^g*TagQQ-;En_Q`$}_h1L{f7ViBE!5_Vwd#3e)OTi)M
zWOA5H&g3>2_O9c<-HnJ6;2BM1KY*Qr7)ud1=%Q$k+#_xhw<?8{;x=vljuZowC}D)`
zf?vQ&KlIr84J1L<0{Z~@QsIQSK8xrkAe$9su0w0wG12qbrK{C^u?$ON!|0gWS$TF{
zl&$lqh&kGLas{9_weFmWUXAzg^zMt`OO&8?BVGe@&|mY`M#IY6{eeEtoTb{H!o(cx
UYw#-jX!^pi%XK}yeC^2l2cG6qRsaA1

diff --git a/test/bytecode_3.3_run/02_pos_args.pyc b/test/bytecode_3.3_run/02_pos_args.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c79d7b87e18bb237c2735385acd2c583f1044bff
GIT binary patch
literal 542
zcmb_Y%}N6?82qxkZKeK!S8ty7WW`>KDB`ss#Y-tH+f7)4yUmhpK*5vsF~s-qS$q!f
z&X-k7kAfjH`7%i+!}qqgKm2%oUwjf#0sM{x)g|EWKoV1sjOazs9Cb`GA=wKGiMb$!
zQ;2<9lK|gG<R;Wc^c;@Xc#;J1_FI$#nx#8z4^SbPF?eNM1CA5m*I62&nCc!l1t{ek
zo=J9l7X1mx>AI;@=8U(68ZCV}9*@q>v&OhAx1~F69zFj#sq%U$^NRsL0ccC@oHgsA
zAwQY6ay=1pu`>PNNJChLNV+qRvG=<msY~VBtS~DV0zUWys8`M@+iJ7AvDVm4H$wHN
TmefZ2N_8#i!}%~i635~TOS55V

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.5_run/02_pos_args.pyc b/test/bytecode_3.5_run/02_pos_args.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..78e416c64ad43872233a30a25b8265bd49c5863b
GIT binary patch
literal 414
zcmY*UJxjzu5S>YKADo<mjfI_E8c)3T5JhYc<gf`s$YqxhOm4$Y0t!~1Kf^!ZPw=nA
z(kivsSUIzPFZ<rUon_ve-5HNZ&ks+RZvgPZ_*ns~V+LI?Dc%UmgL{OCwGS!))pHfV
z2to5J7yGaVWWMr%W>9-@=bqNw61d{|S5XaM5e{G38d4PIC8yw&K@!iAi_n{QJ=Tv9
zVvEZ9tR21YQC?Psj>$AO)stnDO{bHC!?-dOCpM$~>ZTpeilkhs<Y*wC46uD6aqr}s
z3VjFv3%>;p$GOW2(RKWWTN%k&jaWG2PP*rzA8n{S(^SW)Sy7AE?dA!Qwsme+XVx0~
Y$He_boOsUCsHV`LbIOQY{x<I72iE^ci2wiq

literal 0
HcmV?d00001

diff --git a/uncompyle6/semantics/customize37.py b/uncompyle6/semantics/customize37.py
index a552784c..d6aab1a1 100644
--- a/uncompyle6/semantics/customize37.py
+++ b/uncompyle6/semantics/customize37.py
@@ -15,7 +15,11 @@
 """Isolate Python 3.7 version-specific semantic actions here.
 """
 
-from uncompyle6.semantics.consts import PRECEDENCE, TABLE_DIRECT, maxint
+from uncompyle6.semantics.consts import (
+    PRECEDENCE,
+    TABLE_DIRECT,
+    maxint,
+)
 
 def customize_for_version37(self, version):
     ########################
@@ -135,9 +139,9 @@ def customize_for_version37(self, version):
                                  (3, 'importlist37') ),
 
             "importattr37": ("%c", (0, "IMPORT_NAME_ATTR")),
-            'importlist37': ("%C", (0, maxint, ', ') ),
-            'list_if37':  ( " if %p%c", (0, 27), 1 ),
-            'list_if37_not':  ( " if not %p%c", (0, 27), 1 ),
+            "importlist37": ("%C", (0, maxint, ", ")),
+            "list_if37": (" if %p%c", (0, 27), 1),
+            "list_if37_not": (" if not %p%c", (0, 27), 1),
             "testfalse_not_or": ("not %c or %c", (0, "expr"), (2, "expr")),
             "testfalse_not_and": ("not (%c)", 0),
             "try_except36": ("%|try:\n%+%c%-%c\n\n", 1, -2),
@@ -158,5 +162,6 @@ def customize_for_version37(self, version):
                 break
         self.template_engine(("%C", (0, i + 1, ', ')), node)
         self.prune()
+        return
 
     self.n_importlist37 = n_importlist37
diff --git a/uncompyle6/semantics/make_function3.py b/uncompyle6/semantics/make_function3.py
index 7d606038..3a2dde56 100644
--- a/uncompyle6/semantics/make_function3.py
+++ b/uncompyle6/semantics/make_function3.py
@@ -1,4 +1,4 @@
-#  Copyright (c) 2015-2019 by Rocky Bernstein
+#  Copyright (c) 2015-2020 by Rocky Bernstein
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -538,6 +538,10 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
             params.reverse()
         if not is_lambda:
             argc += 1
+        pass
+    elif is_lambda and kwonlyargcount > 0:
+        params.insert(0, "*")
+        kwonlyargcount = 0
 
     # dump parameter list (with default values)
     if is_lambda: