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

Fix bug introduced in last commit

Browse Source
This commit is contained in:
rocky
2018-03-24 06:29:35 -04:00
parent 35a60e0274
commit 0d327ab0ce
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pytest/test_grammar.py
View File

@@ -51,7 +51,6 @@ def test_grammar():
else: else:
expect_right_recursive.add((('l_stmts', expect_right_recursive.add((('l_stmts',
('lastl_stmt', 'COME_FROM', 'l_stmts')))) ('lastl_stmt', 'COME_FROM', 'l_stmts'))))
# expect_lhs.add('kwargs1')
pass pass
pass pass
pass pass

3
uncompyle6/parsers/parse3.py
View File

@@ -114,7 +114,6 @@ class Python3Parser(PythonParser):
kwarg ::= LOAD_CONST expr kwarg ::= LOAD_CONST expr
kwargs ::= kwarg+ kwargs ::= kwarg+
no_kwargs ::=
classdef ::= build_class store classdef ::= build_class store
@@ -983,8 +982,10 @@ class Python3Parser(PythonParser):
if args_kw == 0: if args_kw == 0:
kwargs = 'no_kwargs' kwargs = 'no_kwargs'
self.add_unique_rule("no_kwargs ::=", opname, token.attr, customize)
else: else:
kwargs = 'kwargs' kwargs = 'kwargs'
if self.version < 3.3: if self.version < 3.3:
# positional args after keyword args # positional args after keyword args
rule = ('mkfunc ::= %s %s%s%s' % rule = ('mkfunc ::= %s %s%s%s' %

8
uncompyle6/semantics/pysource.py
View File

@@ -1612,7 +1612,11 @@ class SourceWalker(GenericASTTraversal, object):
subclass_code = mkfunc[1].attr subclass_code = mkfunc[1].attr
else: else:
subclass_code = mkfunc[0].attr subclass_code = mkfunc[0].attr
subclass_info = node[0] if node == 'classdefdeco2':
subclass_info = node
else:
subclass_info = node[0]
else: else:
if node == 'classdefdeco2': if node == 'classdefdeco2':
build_class = node build_class = node
@@ -1683,7 +1687,7 @@ class SourceWalker(GenericASTTraversal, object):
self.write(')') self.write(')')
def print_super_classes3(self, node): def print_super_classes3(self, node):
n = len(node)-1 n = len(node) - 1
if node.kind != 'expr': if node.kind != 'expr':
assert node[n].kind.startswith('CALL_FUNCTION') assert node[n].kind.startswith('CALL_FUNCTION')