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 2 issues in commas in function signatures

Browse Source
This commit is contained in:
x0ret
2019-06-10 00:29:34 +04:30
parent 9ab086b207
commit e82cabc278
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
uncompyle6/semantics/make_function.py
View File

@@ -239,11 +239,13 @@ def make_function3_annotate(self, node, is_lambda, nested=1,
kw_args[i] = "%s: %s" %(n, annotate_dict[n]) kw_args[i] = "%s: %s" %(n, annotate_dict[n])
else: else:
kw_args[i] = "%s" % n kw_args[i] = "%s" % n
self.write(', '.join(kw_args))
self.write(', '.join(kw_args), ', ')
elif argc > 0:
self.write(', ')
if code_has_star_star_arg(code): if code_has_star_star_arg(code):
if argc > 0:
self.write(', ')
star_star_arg = code.co_varnames[argc + kwonlyargcount] star_star_arg = code.co_varnames[argc + kwonlyargcount]
if annotate_dict and star_star_arg in annotate_dict: if annotate_dict and star_star_arg in annotate_dict:
self.write('**%s: %s' % (star_star_arg, annotate_dict[star_star_arg])) self.write('**%s: %s' % (star_star_arg, annotate_dict[star_star_arg]))
@@ -748,7 +750,7 @@ 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))
ends_in_comma = False ends_in_comma = True
if kwonlyargcount > 0: if kwonlyargcount > 0:
if not (4 & code.co_flags): if not (4 & code.co_flags):
if argc > 0: if argc > 0:
@@ -853,6 +855,8 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
ends_in_comma = False ends_in_comma = False
pass pass
elif argc > 0:
self.write(', ')
if code_has_star_star_arg(code): if code_has_star_star_arg(code):
if not ends_in_comma: if not ends_in_comma: