jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-04 01:09:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling py3 annotation args + defparam comma issue

Browse Source
This commit is contained in:
x0ret
2019-07-01 01:28:32 +04:30
parent 50e46531ce
commit 7b7f794913
3 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
uncompyle6/parsers/parse3.py
View File

@@ -1016,26 +1016,48 @@ class Python3Parser(PythonParser):
# Note order of kwargs and pos args changed between 3.3-3.4 # Note order of kwargs and pos args changed between 3.3-3.4
if self.version <= 3.2: 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: 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: 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) self.add_unique_rule(rule, opname, token.attr, customize)

9
uncompyle6/semantics/customize3.py
View File

@@ -255,12 +255,17 @@ def customize_for_version3(self, version):
def n_mkfunc_annotate(node): 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 code object ..
# LOAD_CONST 'x0' if >= 3.3 # LOAD_CONST 'x0' if >= 3.3
# EXTENDED_ARG # EXTENDED_ARG
# MAKE_FUNCTION .. # MAKE_FUNCTION ..
code = node[-4] code = node[-3+i]
elif node[-3] == 'expr': elif node[-3] == 'expr':
code = node[-3][0] code = node[-3][0]
else: else:

3
uncompyle6/semantics/make_function.py
View File

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