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

Correct 3.6+ calls with kwargs

Browse Source
This commit is contained in:
rocky
2018-01-19 06:38:19 -05:00
parent 12397d76b8
commit 4dbcf0400d
4 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -6,7 +6,7 @@ uncompyle6 2.14.3 2017-01-19
- Fix some 2.7 and 2.6 parser bugs
- Fix whilelse parsing bugs
- Correct 2.5- decorator parsing
- grammar for decorators matchies AST more a little better
- grammar for decorators matches AST a little more
- better tests in setup.py for running the right version of Python
- Fix 2.6- parsing of "for .. try/else" ... with "continue" inside

BIN
test/bytecode_3.6/02_kwargs.pyc Normal file
View File

Binary file not shown.

5
test/simple_source/bug36/02_kwargs.py Normal file
View File

@@ -0,0 +1,5 @@
# From 3.6 _markupbase _parse_doctype_subset()
def bug(self, j):
self.parse_comment(j, report=0)
self.parse_comment(j, report=1, foo=2)
self.parse_comment(a, b, report=3)

45
uncompyle6/semantics/pysource.py
View File

@@ -745,18 +745,47 @@ class SourceWalker(GenericASTTraversal, object):
self.default(node)
self.n_fstring_single = fstring_single
def kwargs_only_36(node):
# def kwargs_only_36(node):
# keys = node[-1].attr
# num_kwargs = len(keys)
# values = node[:num_kwargs]
# for i, (key, value) in enumerate(zip(keys, values)):
# self.write(key + '=')
# self.preorder(value)
# if i < num_kwargs:
# self.write(',')
# self.prune()
# return
# self.n_kwargs_only_36 = kwargs_only_36
def kwargs_36(node):
self.write('(')
keys = node[-1].attr
num_kwargs = len(keys)
values = node[:num_kwargs]
for i, (key, value) in enumerate(zip(keys, values)):
self.write(key + '=')
self.preorder(value)
if i < num_kwargs:
self.write(',')
num_posargs = len(node) - (num_kwargs + 1)
n = len(node)
assert n >= len(keys)+2
sep = ''
# FIXME: adjust output for line breaks?
for i in range(num_posargs):
self.write(sep)
self.preorder(node[i])
sep = ', '
i = num_posargs
j = 0
# FIXME: adjust output for line breaks?
while i < n-1:
self.write(sep)
self.write(keys[j] + '=')
self.preorder(node[i])
i += 1
j += 1
self.write(')')
self.prune()
return
self.n_kwargs_only_36 = kwargs_only_36
self.n_kwargs_36 = kwargs_36
def return_closure(node):
# Nothing should be output here