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

Add custom 3.5 handling for f(*a, *b, *c)

Browse Source
This commit is contained in:
rocky
2018-02-08 08:42:38 -05:00
parent 5aeb0424fc
commit f7999d2754
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
test/bytecode_3.5/03_double_star_unpack.pyc-notyet → test/bytecode_3.5/03_double_star_unpack.pyc
View File

0
test/bytecode_3.6_run/.gitignore vendored Normal file
View File

13
uncompyle6/semantics/customize.py
View File

@@ -251,8 +251,8 @@ def customize_for_version(self, is_pypy, version):
node.kind == 'call' node.kind == 'call'
p = self.prec p = self.prec
self.prec = 80 self.prec = 80
self.template_engine(('%c(%P)', 0, self.template_engine(('%c(%P)', 0, (1, -4, ', ',
(1, -4, ', ', 100)), node) 100)), node)
self.prec = p self.prec = p
node.kind == 'async_call' node.kind == 'async_call'
self.prune() self.prune()
@@ -270,7 +270,7 @@ def customize_for_version(self, is_pypy, version):
if key.kind.startswith('CALL_FUNCTION_VAR_KW'): if key.kind.startswith('CALL_FUNCTION_VAR_KW'):
# Python 3.5 changes the stack position of *args. kwargs come # Python 3.5 changes the stack position of *args. kwargs come
# after *args whereas in earlier Pythons, *args is at the end # after *args whereas in earlier Pythons, *args is at the end
# which simpilfiies things from our perspective. # which simplifies things from our perspective.
# Python 3.6+ replaces CALL_FUNCTION_VAR_KW with CALL_FUNCTION_EX # Python 3.6+ replaces CALL_FUNCTION_VAR_KW with CALL_FUNCTION_EX
# We will just swap the order to make it look like earlier Python 3. # We will just swap the order to make it look like earlier Python 3.
entry = table[key.kind] entry = table[key.kind]
@@ -282,6 +282,13 @@ def customize_for_version(self, is_pypy, version):
node[kwarg_pos], node[args_pos] = node[args_pos], node[kwarg_pos] node[kwarg_pos], node[args_pos] = node[args_pos], node[kwarg_pos]
args_pos = kwarg_pos args_pos = kwarg_pos
kwarg_pos += 1 kwarg_pos += 1
elif key.kind == 'CALL_FUNCTION_VAR_0' and node[1][0] == 'build_list_unpack':
self.preorder(node[0])
build_list_unpack = node[1][0]
template = ('(*%P)', (0, len(build_list_unpack)-1, ', *', 100))
self.template_engine(template, build_list_unpack)
self.prune()
self.default(node) self.default(node)
self.n_call = n_call self.n_call = n_call