Merge pull request #273 from rocky/py3-annotation-args

Fix handling py3 annotation args + defparam comma issue

test/simple_source/bug31/04_def_annotate.py

@@ -47,6 +47,12 @@ def test14(*args, name: int=1, qname):
 def test15(*args, name='S', fname, qname=4):
     return args, name, fname, qname
 
+# From 3.4 /asyncio/streams.py open_connection
+_DEFAULT_LIMIT = 5
+def test16(host=None, port=None, *,
+           loop=None, limit=_DEFAULT_LIMIT, **kwds):
+    return host, port, loop, limit, kwds
+
 # Python 3.1 _pyio.py uses the  -> "IOBase" annotation
 def o(f, mode = "r", buffering = None) -> "IOBase":
     return (f, mode, buffering)
@@ -122,6 +128,10 @@ def ann2(args_1, b: int = 5, **kwargs: float) -> float:
     assert ann2.__annotations__['return'] == float
     assert b == 5
 
+class TestSignatureObject():
+    def test_signature_on_wkwonly(self):
+        def test(x:int=55, *args: (int, str), c='test', a:float, kwargs:str="S", **b: int) -> int:
+            pass
 
 assert test1(1, 5) == (1, 5, 4, {})
 assert test1(1, 5, 6, foo='bar') == (1, 5, 6, {'foo': 'bar'})
@@ -139,3 +149,4 @@ ann2(1)
 
 assert test12(1, 2, 3, name='hi') == (1, (2, 3)), "a, *args, name"
 assert test13(1, 2, 3, name='hi') == ((1, 2, 3), 'hi'), "*args, name"
+assert test16('localhost', loop=2, limit=3, a='b') == ('localhost', None, 2, 3, {'a': 'b'})

uncompyle6/parsers/parse3.py

@@ -1016,26 +1016,48 @@ class Python3Parser(PythonParser):
 
                 # Note order of kwargs and pos args changed between 3.3-3.4
                 if self.version <= 3.2:
-                    rule = "mkfunc ::= %s%s%sload_closure LOAD_CODE %s" % (
+                    if annotate_args > 0:
-                        kwargs_str,
+                        rule = "mkfunc_annotate ::= %s%s%sannotate_tuple load_closure LOAD_CODE %s" % (
-                        "expr " * args_pos,
+                            kwargs_str,
-                        "expr " * annotate_args,
+                            "pos_arg " * args_pos,
-                        opname,
+                            "annotate_arg " * (annotate_args - 1),
-                    )
+                            opname,
+                        )
+                    else:
+                        rule = "mkfunc ::= %s%sload_closure LOAD_CODE %s" % (
+                            kwargs_str,
+                            "pos_arg " * args_pos,
+                            opname,
+                        )
                 elif self.version == 3.3:
-                    rule = "mkfunc ::= %s%s%sload_closure LOAD_CODE LOAD_STR %s" % (
+                    if annotate_args > 0:
-                        kwargs_str,
+                        rule = "mkfunc_annotate ::= %s%s%sannotate_tuple load_closure LOAD_CODE LOAD_STR %s" % (
-                        "expr " * args_pos,
+                            kwargs_str,
-                        "expr " * annotate_args,
+                            "pos_arg " * args_pos,
-                        opname,
+                            "annotate_arg " * (annotate_args - 1),
-                    )
+                            opname,
+                        )
+                    else:
+                        rule = "mkfunc ::= %s%sload_closure LOAD_CODE LOAD_STR %s" % (
+                            kwargs_str,
+                            "pos_arg " * args_pos,
+                            opname,
+                        )
+
                 elif self.version >= 3.4:
-                    rule = "mkfunc ::= %s%s%s load_closure LOAD_CODE LOAD_STR %s" % (
+                    if annotate_args > 0:
-                        "expr " * args_pos,
+                        rule = "mkfunc_annotate ::= %s%s%sannotate_tuple load_closure LOAD_CODE LOAD_STR %s" % (
-                        kwargs_str,
+                            "pos_arg " * args_pos,
-                        "expr " * annotate_args,
+                            kwargs_str,
-                        opname,
+                            "annotate_arg " * (annotate_args - 1),
-                    )
+                            opname,
+                        )
+                    else:
+                        rule = "mkfunc ::= %s%s load_closure LOAD_CODE LOAD_STR %s" % (
+                            "pos_arg " * args_pos,
+                            kwargs_str,
+                            opname,
+                        )
 
                 self.add_unique_rule(rule, opname, token.attr, customize)
 

uncompyle6/semantics/customize3.py

@@ -255,12 +255,17 @@ def customize_for_version3(self, version):
 
     def n_mkfunc_annotate(node):
 
-        if self.version >= 3.3 or node[-2] == 'kwargs':
+        # Handling EXTENDED_ARG before MAKE_FUNCTION ...
+        i = -1 if node[-2] == "EXTENDED_ARG" else 0
+
+        if self.version <= 3.2:
+            code = node[-2+i]
+        elif self.version >= 3.3 or node[-2] == 'kwargs':
             # LOAD_CONST code object ..
             # LOAD_CONST        'x0'  if >= 3.3
             # EXTENDED_ARG
             # MAKE_FUNCTION ..
-            code = node[-4]
+            code = node[-3+i]
         elif node[-3] == 'expr':
             code = node[-3][0]
         else:

uncompyle6/semantics/make_function.py

@@ -73,7 +73,7 @@ def make_function3_annotate(self, node, is_lambda, nested=1,
         i = -1
         j = annotate_last-1
         l = -len(node)
-        while j >= l and node[j].kind in ('annotate_arg' 'annotate_tuple'):
+        while j >= l and node[j].kind in ('annotate_arg', 'annotate_tuple'):
             annotate_args[annotate_tup[i]] = node[j][0]
             i -= 1
             j -= 1
@@ -786,6 +786,7 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
                 if flag:
                     kw_args[i] = "%s" % kwargs[i]
             self.write(', '.join(kw_args))
+            ends_in_comma = False
         elif self.version >= 3.6:
             # argc = node[-1].attr
             # co = node[-3].attr