Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2017-11-23 17:17:54 -05:00
8 changed files with 61 additions and 13 deletions

View File

@@ -97,7 +97,9 @@ class Python36Parser(Python35Parser):
""" % (fstring_expr_or_str_n, fstring_expr_or_str_n, "fstring_expr_or_str " * v)
self.add_unique_doc_rules(rules_str, customize)
def custom_classfunc_rule(self, opname, token, customize, seen_LOAD_BUILD_CLASS):
def custom_classfunc_rule(self, opname, token, customize,
seen_LOAD_BUILD_CLASS,
seen_GET_AWAITABLE_YIELD_FROM):
if opname.startswith('CALL_FUNCTION_KW'):
values = 'expr ' * token.attr
rule = 'call_function ::= expr kwargs_only_36 {token.kind}'.format(**locals())
@@ -106,7 +108,9 @@ class Python36Parser(Python35Parser):
self.add_unique_rule(rule, token.kind, token.attr, customize)
else:
super(Python36Parser, self).custom_classfunc_rule(opname, token,
customize, seen_LOAD_BUILD_CLASS)
customize,
seen_LOAD_BUILD_CLASS,
seen_GET_AWAITABLE_YIELD_FROM)
class Python36ParserSingle(Python36Parser, PythonParserSingle):