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

3.4: correct picking up parameter names on oa function call

Browse Source
This commit is contained in:
rocky
2015-12-19 20:52:18 -05:00
parent 18ce905edf
commit aa2fc0f5a5
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_2.7/def1.pyc Normal file
View File

Binary file not shown.

BIN
test/bytecode_2.7/left.pyc Normal file
View File

Binary file not shown.

4
uncompyle6/deparser.py
View File

@@ -1061,6 +1061,7 @@ class Traverser(walker.Walker, object):
return name return name
# node[-1] == MAKE_xxx_n # node[-1] == MAKE_xxx_n
defparams = node[:node[-1].attr] defparams = node[:node[-1].attr]
code = node[code_index].attr code = node[code_index].attr
@@ -1092,7 +1093,8 @@ class Traverser(walker.Walker, object):
# params = map(lambda name, default: build_param(ast, name, default), # params = map(lambda name, default: build_param(ast, name, default),
# paramnames, defparams) # paramnames, defparams)
params = [] params = []
for name, default in map(lambda a, b: (a, b), paramnames, defparams): for i, name in enumerate(paramnames):
default = defparams[i] if len(defparams) > i else None
params.append( build_param(ast, name, default) ) params.append( build_param(ast, name, default) )
params.reverse() # back to correct order params.reverse() # back to correct order

4
uncompyle6/walker.py
View File

@@ -1292,6 +1292,7 @@ class Walker(GenericASTTraversal, object):
else: else:
return name return name
# node[-1] == MAKE_xxx_n # node[-1] == MAKE_xxx_n
defparams = node[:node[-1].attr] defparams = node[:node[-1].attr]
code = node[code_index].attr code = node[code_index].attr
@@ -1323,7 +1324,8 @@ class Walker(GenericASTTraversal, object):
# params = map(lambda name, default: build_param(ast, name, default), # params = map(lambda name, default: build_param(ast, name, default),
# paramnames, defparams) # paramnames, defparams)
params = [] params = []
for name, default in map(lambda a, b: (a, b), paramnames, defparams): for i, name in enumerate(paramnames):
default = defparams[i] if len(defparams) > i else None
params.append( build_param(ast, name, default) ) params.append( build_param(ast, name, default) )
params.reverse() # back to correct order params.reverse() # back to correct order