From 35fcb1edf133762dbf3d183ebe7de64cefab78e6 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 4 Mar 2018 18:40:08 -0500
Subject: [PATCH] Picking out 3.3 function default values

---
 test/bytecode_3.3/03_func_params.pyc       | Bin 484 -> 1565 bytes
 test/simple_source/bug33/03_func_params.py |  11 +++++++++++
 uncompyle6/semantics/make_function.py      |  12 +++++++++---
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/test/bytecode_3.3/03_func_params.pyc b/test/bytecode_3.3/03_func_params.pyc
index 3dc04484019f41410d31ca6b7c07e75cc7efbd09..3fff7e4614ca6c409f8e8df2ade99a2487ac0c36 100644
GIT binary patch
literal 1565
zcmcIkO>fjN5S=8uTUc6AIKYh?C<oLc_KFZ{RUs~mP;Pq}rH;2sm5(KkDM&~?w1Pi@
z_^rILH>*Tl4vR!&kL~fy_<7zqzxNNOXV<?L%aBM>@4JurJ9P62B17A|(*nvux*Z3L
zfZk^jWh1(U-H3EZHxVr&XvdUIoOaS_M-nE9?;)yv1i`uCR)1|-SE|nP>O#p@fG!AR
zJViGn2%tz}(ad8Aip9W25UMbCg3*Q0ZklOC({>+P(>6LS(KFrj6jx2&Lh%?Dd8Ha%
z>Z(l(AL5SMhik0BsM1nzhwfp)gzR$&lb5SPv#D*P^zpg9n9Yt~&3I`m#jCVQOLMgP
zX7^ypT<I%jxr+f2L{VR@<j(TRI7Sx}^Ah4a(U~R!0m#iFq|8zBlW2*FW8_CDL_m|o
z;%OzhN!uXLA3j>l$x6_vlB4C5vFqk37A;yJ2i=5p31Wew$Ag$!32f{N$s9zN1#@2I
zEpzM)C3{8}OM8HcY~*RdU(&*AcU|P5$SdtAwn8qmDpF(Mj>RrH?H~OBu0E-OW39XW
z(FU8qa?n8oxMj9eXqd}7v*3?i(J+6uX|dk#$M<l(M^US^=<sg2#|~v7M|4mnxVyq(
zFi7#BFys~|V)z1Ldts~}sVfOQ%_Npb<1*cy^!jf#AyslJ(d8JFSrSVT&U4}3v9lAy
zaPnR|CZwb65dIyf@_;w+H>A$v|HZ0c-vPGN@dn;QEIJ|w8*~3U1@pYF{Bv0U6x{Eu
iKEKqe9gsid&2s?vf6D6{U+Qn=l^Q9ED10`4GX4V<-d4{5

delta 125
zcmbQs^Mu)V9uF^9v6pHDKO+M}G6NFe1hO4~xL6fPqyP~!24ZALVPa@uWsCwcm>GgK
rST<H_GfMkuFadRxvH%Ic{Jhjsb|51@J}<RAK7R5ER&O?tEHe`TY`znH

diff --git a/test/simple_source/bug33/03_func_params.py b/test/simple_source/bug33/03_func_params.py
index a9356400..79aaa519 100644
--- a/test/simple_source/bug33/03_func_params.py
+++ b/test/simple_source/bug33/03_func_params.py
@@ -4,3 +4,14 @@ def __new__(cls, encode, decode, streamreader=None, streamwriter=None,
     incrementalencoder=None, incrementaldecoder=None, name=None,
     *, _is_text_encoding=None):
     return
+
+# From 3.3 _pyio.py. A closure is created here.
+# This changes how the default params are found
+class StringIO(object):
+    def __init__(self, initial_value="", newline="\n"):
+        super(StringIO, self).__init__()
+
+# No closure created here
+class StringIO2(object):
+    def __init__(self, initial_value="", newline="\n"):
+        return 5
diff --git a/uncompyle6/semantics/make_function.py b/uncompyle6/semantics/make_function.py
index 3798f42d..38c661b1 100644
--- a/uncompyle6/semantics/make_function.py
+++ b/uncompyle6/semantics/make_function.py
@@ -459,8 +459,11 @@ def make_function3(self, node, is_lambda, nested=1, codeNode=None):
 
     # MAKE_CLOSURE adds an additional closure slot
 
-    # Thank you, Python: such a well-thought out system that has
-    # changed and continues to change many times.
+    # In Python 3.6 stack entries change again. I understand
+    # 3.7 changes some of those changes. Yes, it is hard to follow
+    # and I am sure I haven't been able to keep up.
+
+    # Thank you, Python.
 
     def build_param(ast, name, default):
         """build parameters:
@@ -498,7 +501,10 @@ def make_function3(self, node, is_lambda, nested=1, codeNode=None):
     args_node = node[-1]
     if isinstance(args_node.attr, tuple):
         pos_args, kw_args, annotate_argc  = args_node.attr
-        if self.version <= 3.3 and len(node) > 2 and node[lambda_index] != 'LOAD_LAMBDA':
+        # FIXME: there is probably a better way to classify this.
+        if (self.version <= 3.3 and len(node) > 2 and
+            node[lambda_index] != 'LOAD_LAMBDA' and
+            (node[0].kind.startswith('kwarg') or node[2].kind != 'load_closure')):
             # args are after kwargs; kwargs are bundled as one node
             defparams = node[1:args_node.attr[0]+1]
         else: