Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2018-01-08 23:21:24 -05:00
5 changed files with 5 additions and 4 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -157,8 +157,8 @@ class Python36Parser(Python35Parser):
elif opname == 'CALL_FUNCTION_EX': elif opname == 'CALL_FUNCTION_EX':
self.addRule(""" self.addRule("""
expr ::= call_ex expr ::= call_ex
unpack_list ::= list starred ::= expr
call_ex ::= expr unpack_list CALL_FUNCTION_EX call_ex ::= expr starred CALL_FUNCTION_EX
""", nop_func) """, nop_func)
pass pass
else: else:

View File

@@ -533,8 +533,9 @@ class SourceWalker(GenericASTTraversal, object):
'fstring_single': ( "f'{%c%{conversion}}'", 0), 'fstring_single': ( "f'{%c%{conversion}}'", 0),
'fstring_multi': ( "f'%c'", 0), 'fstring_multi': ( "f'%c'", 0),
'func_args36': ( "%c(**", 0), 'func_args36': ( "%c(**", 0),
'try_except36': ( '%|try:\n%+%c%-%c\n\n', 1, 2 ), 'try_except36': ( '%|try:\n%+%c%-%c\n\n', 1, 2 ),
'unpack_list': ( '*%c', (0, 'list') ), 'unpack_list': ( '*%c', (0, 'list') ),
'starred': ( '*%c', (0, 'expr') ),
'call_ex' : ( 'call_ex' : (
'%c(%c)', '%c(%c)',
(0, 'expr'), 1), (0, 'expr'), 1),