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 py3 function signatures + annotations + ordering

Browse Source
This commit is contained in:
x0ret
2019-06-09 23:46:33 +04:30
parent 9811c5bc42
commit 4022e80d6d
1 changed files with 104 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
uncompyle6/semantics/make_function.py
View File

@@ -91,6 +91,12 @@ def make_function3_annotate(self, node, is_lambda, nested=1,
annotate_argc = 0 annotate_argc = 0
pass pass
annotate_dict = {}
for name in annotate_args.keys():
n = self.traverse(annotate_args[name], indent='')
annotate_dict[name] = n
if 3.0 <= self.version <= 3.2: if 3.0 <= self.version <= 3.2:
lambda_index = -2 lambda_index = -2
elif 3.03 <= self.version: elif 3.03 <= self.version:
@@ -109,7 +115,11 @@ def make_function3_annotate(self, node, is_lambda, nested=1,
# add defaults values to parameter names # add defaults values to parameter names
argc = code.co_argcount argc = code.co_argcount
kwonlyargcount = code.co_kwonlyargcount
paramnames = list(code.co_varnames[:argc]) paramnames = list(code.co_varnames[:argc])
if kwonlyargcount > 0:
kwargs = list(code.co_varnames[argc:argc+kwonlyargcount])
try: try:
ast = self.build_ast(code._tokens, ast = self.build_ast(code._tokens,
@@ -135,10 +145,6 @@ def make_function3_annotate(self, node, is_lambda, nested=1,
indent = ' ' * l indent = ' ' * l
line_number = self.line_number line_number = self.line_number
if code_has_star_arg(code):
self.write('*%s' % code.co_varnames[argc + kw_pairs])
argc += 1
i = len(paramnames) - len(defparams) i = len(paramnames) - len(defparams)
suffix = '' suffix = ''
@@ -147,10 +153,8 @@ def make_function3_annotate(self, node, is_lambda, nested=1,
for param in paramnames[:i]: for param in paramnames[:i]:
self.write(suffix, param) self.write(suffix, param)
suffix = ', ' suffix = ', '
if param in annotate_tuple[0].attr: if param in annotate_dict:
p = annotate_tuple[0].attr.index(param) self.write(': %s' % annotate_dict[param])
self.write(': ')
self.preorder(node[p])
if (line_number != self.line_number): if (line_number != self.line_number):
suffix = ",\n" + indent suffix = ",\n" + indent
line_number = self.line_number line_number = self.line_number
@@ -187,8 +191,16 @@ def make_function3_annotate(self, node, is_lambda, nested=1,
suffix = ', ' suffix = ', '
if code_has_star_arg(code):
star_arg = code.co_varnames[argc + kwonlyargcount]
if annotate_dict and star_arg in annotate_dict:
self.write(suffix, '*%s: %s' % (star_arg, annotate_dict[star_arg]))
else:
self.write(suffix, '*%s' % star_arg)
argc += 1
# self.println(indent, '#flags:\t', int(code.co_flags)) # self.println(indent, '#flags:\t', int(code.co_flags))
if kw_args + annotate_argc > 0: if kwonlyargcount > 0:
if no_paramnames: if no_paramnames:
if not code_has_star_arg(code): if not code_has_star_arg(code):
if argc > 0: if argc > 0:
@@ -198,49 +210,45 @@ def make_function3_annotate(self, node, is_lambda, nested=1,
pass pass
else: else:
self.write(", ") self.write(", ")
else:
if argc > 0:
self.write(', ')
kwargs = node[0] kw_args = [None] * kwonlyargcount
last = len(kwargs)-1
i = 0 for n in node:
for n in node[0]: if n == 'kwargs':
if n == 'kwarg': n = n[0]
if (line_number != self.line_number): if n == 'kwarg':
self.write("\n" + indent) name = eval(n[0].pattr)
line_number = self.line_number idx = kwargs.index(name)
self.write('%s=' % n[0].pattr) default = self.traverse(n[1], indent='')
self.preorder(n[1]) if annotate_dict and name in annotate_dict:
if i < last: kw_args[idx] = '%s: %s=%s' % (name, annotate_dict[name], default)
self.write(', ') else:
i += 1 kw_args[idx] = '%s=%s' % (name, default)
pass
pass
annotate_args = []
for n in node:
if n == 'annotate_arg':
annotate_args.append(n[0])
elif n == 'annotate_tuple':
t = n[0].attr
if t[-1] == 'return':
t = t[0:-1]
annotate_args = annotate_args[:-1]
pass
last = len(annotate_args) - 1
for i in range(len(annotate_args)):
self.write("%s: " % (t[i]))
self.preorder(annotate_args[i])
if i < last:
self.write(', ')
pass
pass
break
pass pass
pass pass
# handling other args
ann_other_kw = [c == None for c in kw_args]
for i, flag in enumerate(ann_other_kw):
if flag:
n = kwargs[i]
if n in annotate_dict:
kw_args[i] = "%s: %s" %(n, annotate_dict[n])
else:
kw_args[i] = "%s" % n
self.write(', '.join(kw_args))
if code_has_star_star_arg(code): if code_has_star_star_arg(code):
if argc > 0: if argc > 0:
self.write(', ') self.write(', ')
self.write('**%s' % code.co_varnames[argc + kw_pairs]) star_star_arg = code.co_varnames[argc + kwonlyargcount]
if annotate_dict and star_star_arg in annotate_dict:
self.write('**%s: %s' % (star_star_arg, annotate_dict[star_star_arg]))
else:
self.write('**%s' % star_star_arg)
if is_lambda: if is_lambda:
self.write(": ") self.write(": ")
@@ -476,7 +484,7 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
# Thank you, Python. # Thank you, Python.
def build_param(ast, name, default): def build_param(ast, name, default, annotation=None):
"""build parameters: """build parameters:
- handle defaults - handle defaults
- handle format tuple parameters - handle format tuple parameters
@@ -486,7 +494,10 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
else: else:
value = self.traverse(default, indent='') value = self.traverse(default, indent='')
maybe_show_tree_param_default(self.showast, name, value) maybe_show_tree_param_default(self.showast, name, value)
result = '%s=%s' % (name, value) if annotation:
result = '%s: %s=%s' % (name, annotation, value)
else:
result = '%s=%s' % (name, value)
# The below can probably be removed. This is probably # The below can probably be removed. This is probably
# a holdover from days when LOAD_CONST erroneously # a holdover from days when LOAD_CONST erroneously
@@ -654,7 +665,11 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
# add defaults values to parameter names # add defaults values to parameter names
argc = code.co_argcount argc = code.co_argcount
kwonlyargcount = code.co_kwonlyargcount
paramnames = list(scanner_code.co_varnames[:argc]) paramnames = list(scanner_code.co_varnames[:argc])
if kwonlyargcount > 0:
kwargs = list(scanner_code.co_varnames[argc:argc+kwonlyargcount])
# defaults are for last n parameters, thus reverse # defaults are for last n parameters, thus reverse
paramnames.reverse(); paramnames.reverse();
@@ -681,17 +696,30 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
params = [] params = []
if defparams: if defparams:
for i, defparam in enumerate(defparams): for i, defparam in enumerate(defparams):
params.append(build_param(ast, paramnames[i], defparam)) params.append(build_param(ast, paramnames[i], defparam,
annotate_dict.get(paramnames[i])))
params += paramnames[i+1:] for param in paramnames[i+1:]:
if param in annotate_dict:
params.append("%s: %s" % (param, annotate_dict[param]))
else:
params.append(param)
else: else:
params = paramnames for param in paramnames:
if param in annotate_dict:
params.append("%s: %s" % (param, annotate_dict[param]))
else:
params.append(param)
params.reverse() # back to correct order params.reverse() # back to correct order
if code_has_star_arg(code): if code_has_star_arg(code):
if self.version > 3.0: if self.version > 3.0:
params.append('*%s' % code.co_varnames[argc + kw_pairs]) star_arg = code.co_varnames[argc + kwonlyargcount]
if annotate_dict and star_arg in annotate_dict:
params.append('*%s: %s' % (star_arg, annotate_dict[star_arg]))
else:
params.append('*%s' % star_arg)
else: else:
params.append('*%s' % code.co_varnames[argc]) params.append('*%s' % code.co_varnames[argc])
argc += 1 argc += 1
@@ -720,10 +748,8 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
self.write("(", ", ".join(params)) self.write("(", ", ".join(params))
# self.println(indent, '#flags:\t', int(code.co_flags)) # self.println(indent, '#flags:\t', int(code.co_flags))
kwonlyargcount = 0
ends_in_comma = False ends_in_comma = False
if kw_args + annotate_argc > 0: if kwonlyargcount > 0:
if not (4 & code.co_flags): if not (4 & code.co_flags):
if argc > 0: if argc > 0:
self.write(", *, ") self.write(", *, ")
@@ -767,9 +793,9 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
break break
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
# argcount = co.co_argcount # argcount = co.co_argcount
kwcount = kwonlyargcount = co.co_kwonlyargcount # kwonlyargcount = co.co_kwonlyargcount
free_tup = ann_dict = kw_dict = default_tup = None free_tup = ann_dict = kw_dict = default_tup = None
fn_bits = node[-1].attr fn_bits = node[-1].attr
@@ -793,6 +819,8 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
kw_dict = kw_dict[0] kw_dict = kw_dict[0]
# FIXME: handle free_tup, annotate_dict, and default_tup # FIXME: handle free_tup, annotate_dict, and default_tup
kw_args = [None] * kwonlyargcount
if kw_dict: if kw_dict:
assert kw_dict == 'dict' assert kw_dict == 'dict'
defaults = [self.traverse(n, indent='') for n in kw_dict[:-2]] defaults = [self.traverse(n, indent='') for n in kw_dict[:-2]]
@@ -801,32 +829,29 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
sep = '' sep = ''
# FIXME: possibly handle line breaks # FIXME: possibly handle line breaks
for i, n in enumerate(names): for i, n in enumerate(names):
self.write(sep) idx = kwargs.index(n)
if annotate_dict and n in annotate_dict: if annotate_dict and n in annotate_dict:
self.write("%s: %s=%s" % (n, annotate_dict[n], defaults[i])) t = "%s: %s=%s" % (n, annotate_dict[n], defaults[i])
else: else:
self.write("%s=%s" % (n, defaults[i])) t = "%s=%s" % (n, defaults[i])
sep = ', ' kw_args[idx] = t
ends_in_comma = False
kwcount -= 1
pass pass
pass pass
if ann_dict:
annotate_args = ann_dict[0][-2].attr
if annotate_args[-1] == 'return':
annotate_args = annotate_args[:-1]
sep = '' # handle others
if not ends_in_comma: if ann_dict:
sep = ', ' ann_other_kw = [c == None for c in kw_args]
for n in annotate_args:
if kwcount == 0: for i, flag in enumerate(ann_other_kw):
break if flag:
self.write(sep) n = kwargs[i]
self.write('%s: %s' %(n, annotate_dict[n])) if n in annotate_dict:
sep = ', ' kw_args[i] = "%s: %s" %(n, annotate_dict[n])
ends_in_comma = False else:
kwcount -= 1 kw_args[i] = "%s" % n
self.write(', '.join(kw_args))
ends_in_comma = False
pass pass
if code_has_star_star_arg(code): if code_has_star_star_arg(code):