From 3500c49dafeaca03d7719b0cacaf7c1cb6d1f059 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Mon, 26 Mar 2018 19:40:33 -0400
Subject: [PATCH] More Python 3.4 CALL_FUNCTION_VAR

---
 test/bytecode_3.4_run/04_call_function.pyc   | Bin 1247 -> 1443 bytes
 test/simple_source/bug35/04_call_function.py |   5 +++++
 uncompyle6/semantics/customize.py            |   4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/bytecode_3.4_run/04_call_function.pyc b/test/bytecode_3.4_run/04_call_function.pyc
index 96fb939a10086794abdaece1c7b683373589c18a..b62f39034fcc829543dab1555eb59830448bf03a 100644
GIT binary patch
delta 279
zcmcc5xtLq|9S<+p-{zfB7g-n>9y1^TAfLejh>Pb>RPGh$Wk}&;Na1Hl5nyOxV2t8s
zNMT?I))d^hbp><%EtZ`8<m`}SW}s?DAZ7((b|7{K;$nFqQNzek!^DsRB$*jfm>6mp
z7_t}`nt|dh3_XlY!J5o|MN&XzQOwCD6`DZ9(^E_0lk@XRQY%U{S&Kl%-eOA2ixMcQ
zEJ#hxPf3l>FNz1T!Mcj{KrSr;SqLFGK<Zh;5_3vZ^?}S{kTe4$KVy*$kk;gx9M9s#
gC^LB}i<+1aP=KGEhfRi&hmnUxf|-Ynot2*h0OFxEw*UYD

delta 91
zcmZ3?eV<eL9S<*8`t==A0xS#+j~S2vGmz~7#KpZ6m3vtk7=kr<Hy&TX%%sUZS%%e%
ik$v(-M&Zfztb8H@Kt=rQJZv(IJd8Xn63jeo?5qG|D-YiQ

diff --git a/test/simple_source/bug35/04_call_function.py b/test/simple_source/bug35/04_call_function.py
index 6355d27e..9242022e 100644
--- a/test/simple_source/bug35/04_call_function.py
+++ b/test/simple_source/bug35/04_call_function.py
@@ -42,3 +42,8 @@ def __init__(self, cnf={}):
         cnf['title'], cnf['text'],
         cnf['bitmap'], cnf['default'],
         *cnf['strings'])
+
+# From python 3.4.8 multiprocessing/context.py
+def Value(self, fn, typecode_or_type, *args, lock=True):
+    return fn(typecode_or_type, *args, lock=lock,
+              ctx=self.get_context())
diff --git a/uncompyle6/semantics/customize.py b/uncompyle6/semantics/customize.py
index b0d1a3ea..681461dc 100644
--- a/uncompyle6/semantics/customize.py
+++ b/uncompyle6/semantics/customize.py
@@ -269,8 +269,8 @@ def customize_for_version(self, is_pypy, version):
                                             0, -2, (1, kwargs+1, ', '))
                             else:
                                 template = ('%c(%C, *%c, %C)',
-                                            0, -2, (1, kwargs+1, ', '),
-                                                (kwargs+1, -2, ', '))
+                                            0, (1, nargs+1, ', '),
+                                            -2, (-2-kwargs, -2, ', '))
                             self.template_engine(template, node)
                             self.prune()