From 254d0519bbae2dffbf2dcc130e02aebda221e8f1 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 1 Apr 2018 11:26:46 -0400
Subject: [PATCH] More 3.6 CALL_FUNCTION argument parsing

---
 test/bytecode_3.6_run/10_argparse.pyc   | Bin 1153 -> 864 bytes
 test/simple_source/bug36/10_argparse.py |  51 ++++++++----------------
 uncompyle6/semantics/customize.py       |  13 ++++--
 3 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/test/bytecode_3.6_run/10_argparse.pyc b/test/bytecode_3.6_run/10_argparse.pyc
index 891345a826d877ef4ba4f33ac51f09dd21c8fa55..78be71d8e8cfa66d70f94775c668ffefa21e9b95 100644
GIT binary patch
literal 864
zcmb7?&2G~`5Xbk+u3Kn;8xktAA|%IAL}`mSAc9&|Tz%o@i{)lFk!fOw-Hi~Txgf4^
z<q;5X!E^Y^DQ{5q#LPA|34#MF&FrjqG@jpo_Gou^=iB9v^pp|uldLT`lVdRR2%IF6
zj!8-+ll&7&sT9(Kok?GA!OkUpP2yk)nIsud++cAq0d@-Js#x-d4xy4{1^q%7RPqJ8
zpcm|%nb5M2R1&Bnk}KM-y|=T<s`-N?pC~iU2ddNUeu&!9^DuHZ(ISp{9prj6&9zbW
zc9U4QPK;677FGF5>q<kKFls!kS!rtDSY4E(??mrFQ&(+MOr~R%nQEp7YX59DI(oK$
z@Fcq_`*`}kj;t~^D{uP9jLr4=JIF9uS=mCW(iX!)X(Tm1I707ILG^8jHl*<2gOj2M
z!MYTZOHt6T%t_)kl5`qL{G_J&5@ppm6^+8q!-lw%_YZpEU-WT3Y5cFo#$v9wFb>dd
zqeBs{-7Sdf!#_}0n0YDxNsVPz)c2A44xBfrn+MQ_8>GhZOa7U`_(j9|uwnI*WfwA2
z0aKsEEak(hO8Hr?=X<|_;n<HbA?k&2-+y`tui<}bTbs1l`HG~4B=_JPi|e8|ONZvZ
auF2*EblL?kCY79x)k_?Xs}s<`3;bUK2*Dr#

literal 1153
zcmY*XOK;Oa5VjpBag!!36iRt7k4q4tKqZ7kQ_%yx@DKt{zEpN*oNVitcGrnw#D$(K
z@i(~e3pjA*7a(7ekb38Ygv6|yw87Sn_M7*9GaIc|qxa&Q``0#%pT^u*r~6Yn(lHGK
z3@}5(HPF~I!Gg-6=~`&*Rlp{V4b=k^YETE~&^C=yzW@zr!XmUzG;LUdWvs#(ID1%~
zdab}Y@;X1~wF(zt4KBi^leo)pg?z5g`CKD>op7bhQado*I@b3bVEdN*q82`ygc`6+
z=<5_UOWXG;S{xW;`!Pi=SR?dnirS^;?<rc+=#wdJjlq0tbZ#7JieBZnflE(HjQkK;
z64MbZN(8c$_xDK^@DOFkben*(FL<hW5*N*5<E}OqmM;qPPQIju{{?j_g{>wj7S-4j
z16kNZ4Ab1|MtQB<jW9}zhE!B&SBVVsTd6>aVuVban2&0V7_-ynICWtaHLtH55PGJR
zE6iKnE{_3Y72*iPBbvRDKh~YZS>&T&Nx=Nji}xk-Cu}_A{UK8cI}TwUi*d|eZohfX
z%5ZAA4j6b@s6>@A&B}Orqucf3I8mO${Ne1z(4%xAC(_1T4Jn-*CPJ|!?I(b2jxcI9
z)j8;qo+dhP_j+6Gee6Z}fo=AB`AZ%gv#y3-T#jLme#Rw}DfW555$>{7@K`Z5B(0Bu
z9#z@LDOHn>C7N^XE6un<sqz((#Y|!tl#t1c(|fG$DDP;)2!)@Jb@GHd2q(-70_-cQ
zeG))kJDugip@F8JkXW?0#UP7_{?{6cqE@O!vFHKpl2>VSogLbfcX}5p)Oyh<owS*@
zLQB_~QA!DE7loejGa(Y;Hs_{W*m^gFMNe~`8I`WBUsjl-&xTmlkJjSPP06D)#9f(W
zqL1r-HrRNy{@}i@Sr)&SP6}r;N+1hyOD~PwBH@^}sZWD`+pLv$r<BKclGaSGJsqoU
Hp8o#;re;_{

diff --git a/test/simple_source/bug36/10_argparse.py b/test/simple_source/bug36/10_argparse.py
index 14685606..966bdfcf 100644
--- a/test/simple_source/bug36/10_argparse.py
+++ b/test/simple_source/bug36/10_argparse.py
@@ -1,37 +1,18 @@
-# From 3.6.4 pickletools.py
-# Bug in 3.6 CALL_FUNCTION_KW in an not exponentially
-
+# From 3.6.4 test_argparse.py
+# Bug was in parsing ** args
 import argparse
-parser = argparse.ArgumentParser(
-    description='disassemble one or more pickle files')
-parser.add_argument(
-    'pickle_file', type=argparse.FileType('br'),
-    nargs='*', help='the pickle file')
-parser.add_argument(
-    '-m', '--memo', action='store_true',
-    help='preserve memo between disassemblies')
-parser.add_argument(
-    '-l', '--indentlevel', default=4, type=int,
-    help='the number of blanks by which to indent a new MARK level')
-parser.add_argument(
-    '-a', '--annotate',  action='store_true',
-    help='annotate each line with a short opcode description')
-parser.add_argument(
-    '-p', '--preamble', default="==> {name} <==",
-    help='if more than one pickle file is specified, print this before'
-    ' each disassembly')
-parser.add_argument(
-    '-t', '--test', action='store_true',
-    help='run self-test suite')
-parser.add_argument(
-    '-v', action='store_true',
-    help='run verbosely; only affects self-test run')
-args = parser.parse_args()
+def test_namespace_starkwargs_notidentifier(self):
+    ns = argparse.Namespace(**{'"': 'quote'})
+    string = """Namespace(**{'"': 'quote'})"""
+    assert ns ==  string
 
-assert args.annotate == False
-assert args.indentlevel == 4
-assert args.memo == False
-assert args.pickle_file == []
-assert args.preamble == '==> {name} <=='
-assert args.test == False
-assert args.v == False
+def test_namespace_kwargs_and_starkwargs_notidentifier(self):
+    ns = argparse.Namespace(a=1, **{'"': 'quote'})
+    string = """Namespace(a=1, **{'"': 'quote'})"""
+    assert ns == string
+
+
+def test_namespace(self):
+    ns = argparse.Namespace(foo=42, bar='spam')
+    string = "Namespace(bar='spam', foo=42)"
+    assert ns == string
diff --git a/uncompyle6/semantics/customize.py b/uncompyle6/semantics/customize.py
index 2d987f17..88d431e2 100644
--- a/uncompyle6/semantics/customize.py
+++ b/uncompyle6/semantics/customize.py
@@ -408,9 +408,13 @@ def customize_for_version(self, is_pypy, version):
 
                 # Value 100 is important; it is exactly
                 # module/function precidence.
-                PRECEDENCE['call_kw']   = 100
-                PRECEDENCE['call_kw36'] = 100
-                PRECEDENCE['call_ex']   = 100
+                PRECEDENCE['call_kw']     = 100
+                PRECEDENCE['call_kw36']   = 100
+                PRECEDENCE['call_ex']     = 100
+                PRECEDENCE['call_ex_kw']  = 100
+                PRECEDENCE['call_ex_kw2'] = 100
+                PRECEDENCE['call_ex_kw3'] = 100
+                PRECEDENCE['call_ex_kw4'] = 100
 
                 TABLE_DIRECT.update({
                     'tryfinally36':  ( '%|try:\n%+%c%-%|finally:\n%+%c%-\n\n',
@@ -570,7 +574,8 @@ def customize_for_version(self, is_pypy, version):
                     assert call_function_ex == 'CALL_FUNCTION_EX_KW'
                     # FIXME: decide if the below test be on kwargs == 'dict'
                     if (call_function_ex.attr & 1 and
-                        (not isinstance(kwargs, Token) and kwargs != 'attribute')):
+                        (not isinstance(kwargs, Token) and kwargs != 'attribute')
+                        and not kwargs[0].kind.startswith('kvlist')):
                         self.call36_dict(kwargs)
                     else:
                         self.write('**')