From cfb4ad625f7b77591d3cc91cae9cdae93cc0a842 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 25 Mar 2018 22:24:32 -0400
Subject: [PATCH] 3.5 *() arg without further args

---
 test/bytecode_3.5/04_call_function.pyc       | Bin 811 -> 991 bytes
 test/simple_source/bug35/04_call_function.py |   7 +++++++
 uncompyle6/parsers/parse35.py                |   6 ++++--
 uncompyle6/semantics/customize.py            |   5 ++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/test/bytecode_3.5/04_call_function.pyc b/test/bytecode_3.5/04_call_function.pyc
index a0b9916903f05551c3be56f9dfdecb7ea7be1ad4..6b44e22df9e4994d8eebf91eb606cc5f1b8a682b 100644
GIT binary patch
delta 260
zcmZ3@cAs5YoR^o2A#z95PbLP2#|%h-8OU}3;^Oj&%GrXP3@Ka;Ees4%Kn4RtuqOA$
z$!bjX$&649AetM9ok1G3fJCJrLnZ@576U^X149o317moe5CcmIBSSV9Ly;;2BO_yE
z9wS2p*eFInO{QBs@$t#|c_oRNdBySZw>U#83sPN+it>vz8H+#;DPo5c96;7B!IISC
zl6aM}#G=Ha^kRef)QS=*pm;Gzl7W$#QIL_Bu}B2S*5sPJo5_I%#GL$#Nm+mg$lzz^
OVUuCxVdP<vU<Lp-YAy}{

delta 79
zcmcc5zM4&0oR^nN#(!H>F%tvBV+JI^3}ib1adGxU<!n|4hG0$3jq}x*m^3*jXD~ZV
WUdyb+#|4z;XXjy)VdP=tVF3UopA1|8

diff --git a/test/simple_source/bug35/04_call_function.py b/test/simple_source/bug35/04_call_function.py
index 3c7e2759..eae65771 100644
--- a/test/simple_source/bug35/04_call_function.py
+++ b/test/simple_source/bug35/04_call_function.py
@@ -21,3 +21,10 @@ def Time2Internaldate(date_time):
     return datetime(*date_time[:6], tzinfo=timezone(delta))
 
 assert Time2Internaldate(time.localtime())
+
+# From 3.5.5 tkinter/dialog.py
+def test_varargs0_ext(self):
+    try:
+        {}.__contains__(*())
+    except TypeError:
+        pass
diff --git a/uncompyle6/parsers/parse35.py b/uncompyle6/parsers/parse35.py
index a53e3187..942400ec 100644
--- a/uncompyle6/parsers/parse35.py
+++ b/uncompyle6/parsers/parse35.py
@@ -210,7 +210,6 @@ class Python35Parser(Python34Parser):
             self.add_unique_rule(rule, token.kind, uniq_param, customize)
             self.add_unique_rule('expr ::= async_call', token.kind, uniq_param, customize)
 
-        uniq_param = args_kw + args_pos
         if opname.startswith('CALL_FUNCTION_VAR'):
             # Python 3.5 changes the stack position of *args. KW args come
             # after *args.
@@ -226,7 +225,10 @@ class Python35Parser(Python34Parser):
             rule = ('call ::= expr expr ' +
                     ('pos_arg ' * args_pos) +
                     ('kwarg ' * args_kw) + kw + token.kind)
-            self.add_unique_rule(rule, token.kind, uniq_param, customize)
+
+            # Note: semantic actions make use of the fact of wheter  "args_pos"
+            # zero or not in creating a template rule.
+            self.add_unique_rule(rule, token.kind, args_pos, customize)
         else:
             super(Python35Parser, self).custom_classfunc_rule(opname, token, customize,
                                                               seen_LOAD_BUILD_CLASS,
diff --git a/uncompyle6/semantics/customize.py b/uncompyle6/semantics/customize.py
index 51aa6bca..fc179b22 100644
--- a/uncompyle6/semantics/customize.py
+++ b/uncompyle6/semantics/customize.py
@@ -313,7 +313,10 @@ def customize_for_version(self, is_pypy, version):
                                 template = ('*%P)', (0, len(args_node)-1, ', *', 100))
                                 self.template_engine(template, args_node)
                             else:
-                                template = ('*%c, %C)', 1, (2, -1, ', '))
+                                if len(node) > 3:
+                                    template = ('*%c, %C)', 1, (2, -1, ', '))
+                                else:
+                                    template = ('*%c)', 1)
                                 self.template_engine(template, node)
                             self.prune()