p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix AST rewriting with starred expressions in function calls

This commit is contained in:
Thomas Kluyver 2015-07-15 15:31:35 -07:00
parent 62ca4ae963
commit 195422f9c0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
_pytest/assertion/rewrite.py
View File

@ -775,10 +775,7 @@ class AssertionRewriter(ast.NodeVisitor):
new_kwargs = [] new_kwargs = []
for arg in call.args: for arg in call.args:
res, expl = self.visit(arg) res, expl = self.visit(arg)
if type(arg) is ast.Starred: arg_expls.append(expl)
arg_expls.append("*" + expl)
else:
arg_expls.append(expl)
new_args.append(res) new_args.append(res)
for keyword in call.keywords: for keyword in call.keywords:
res, expl = self.visit(keyword.value) res, expl = self.visit(keyword.value)
@ -795,6 +792,11 @@ class AssertionRewriter(ast.NodeVisitor):
outer_expl = "%s\n{%s = %s\n}" % (res_expl, res_expl, expl) outer_expl = "%s\n{%s = %s\n}" % (res_expl, res_expl, expl)
return res, outer_expl return res, outer_expl
def visit_Starred(self, starred):
# From Python 3.5, a Starred node can appear in a function call
res, expl = self.visit(starred.value)
return starred, '*' + expl
def visit_Call_legacy(self, call): def visit_Call_legacy(self, call):
""" """
visit `ast.Call nodes on 3.4 and below` visit `ast.Call nodes on 3.4 and below`