From 50e46531ce912c9e377c64626fa9b4f1ab6ef29c Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 29 Jun 2019 23:33:21 -0400 Subject: [PATCH] Adjust 3.x grammar rules to include annotate args --- uncompyle6/parsers/parse3.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py index 34a04bf7..4f4c19da 100644 --- a/uncompyle6/parsers/parse3.py +++ b/uncompyle6/parsers/parse3.py @@ -1016,21 +1016,24 @@ class Python3Parser(PythonParser): # Note order of kwargs and pos args changed between 3.3-3.4 if self.version <= 3.2: - rule = "mkfunc ::= %s%sload_closure LOAD_CODE %s" % ( + rule = "mkfunc ::= %s%s%sload_closure LOAD_CODE %s" % ( kwargs_str, "expr " * args_pos, + "expr " * annotate_args, opname, ) elif self.version == 3.3: - rule = "mkfunc ::= %s%sload_closure LOAD_CODE LOAD_STR %s" % ( + rule = "mkfunc ::= %s%s%sload_closure LOAD_CODE LOAD_STR %s" % ( kwargs_str, "expr " * args_pos, + "expr " * annotate_args, opname, ) elif self.version >= 3.4: - rule = "mkfunc ::= %s%s load_closure LOAD_CODE LOAD_STR %s" % ( + rule = "mkfunc ::= %s%s%s load_closure LOAD_CODE LOAD_STR %s" % ( "expr " * args_pos, kwargs_str, + "expr " * annotate_args, opname, )