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

Python 3.x bug in handling var number of args

Browse Source
This commit is contained in:
rocky
2016-08-31 06:17:06 -04:00
parent 6189ce3c04
commit c9f364df9f
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.5/02_fn_varargs.pyc Normal file
View File

Binary file not shown.

5
test/simple_source/bug35/02_fn_varargs.py Normal file
View File

@@ -0,0 +1,5 @@
# From python 3.4 pstats.py
# Bug was not adding *, since *args covers that. And getting stream=None
# without *
def __init__(self, *args, stream=None):
pass

17
uncompyle6/semantics/pysource.py
View File

@@ -2010,8 +2010,12 @@ class SourceWalker(GenericASTTraversal, object):
params.reverse() # back to correct order
if 4 & code.co_flags: # flag 2 -> variable number of args
params.append('*%s' % code.co_varnames[argc])
if self.version > 3.0:
params.append('*%s' % code.co_varnames[argc + args_node.attr[1]])
else:
params.append('*%s' % code.co_varnames[argc])
argc += 1
if 8 & code.co_flags: # flag 3 -> keyword args
params.append('**%s' % code.co_varnames[argc])
argc += 1
@@ -2025,10 +2029,15 @@ class SourceWalker(GenericASTTraversal, object):
# self.println(indent, '#flags:\t', int(code.co_flags))
if kw_args > 0:
if argc > 0:
self.write(", *, ")
if not (4 & code.co_flags):
if argc > 0:
self.write(", *, ")
else:
self.write("*, ")
pass
else:
self.write("*, ")
self.write(", ")
for n in node:
if n == 'pos_arg':
continue