Iterate over args and kwargs with care

ast.Call.args is [argument node] ast.Call.keywords however is [ast.keyword] You need to do isinstance(keyword_node.value, X) otherwise handling of args and kwargs will be different.

Author: bcaller

pyt/cfg/stmt_visitor.py

@@ -615,7 +615,8 @@ def add_blackbox_or_builtin_call(self, node, blackbox):
  rhs_vars = list()
  last_return_value_of_nested_call = None
 
- for arg in itertools.chain(node.args, node.keywords):
+ for arg_node in itertools.chain(node.args, node.keywords):
+ arg = arg_node.value if isinstance(arg_node, ast.keyword) else arg_node
  if isinstance(arg, ast.Call):
  return_value_of_nested_call = self.visit(arg)
 
@@ -634,15 +635,18 @@ def add_blackbox_or_builtin_call(self, node, blackbox):
  call_node.inner_most_call = return_value_of_nested_call
  last_return_value_of_nested_call = return_value_of_nested_call
 
- visual_args.append(return_value_of_nested_call.left_hand_side)
+ if isinstance(arg_node, ast.keyword) and arg_node.arg is not None:
+ visual_args.append(arg_node.arg + '=' + return_value_of_nested_call.left_hand_side)
+ else:
+ visual_args.append(return_value_of_nested_call.left_hand_side)
  rhs_vars.append(return_value_of_nested_call.left_hand_side)
  else:
  label = LabelVisitor()
- label.visit(arg)
+ label.visit(arg_node)
  visual_args.append(label.result)
 
  vv = VarsVisitor()
- vv.visit(arg)
+ vv.visit(arg_node)
  rhs_vars.extend(vv.result)
  if last_return_value_of_nested_call:
  # connect other_inner to outer in e.g.

pyt/helper_visitors/vars_visitor.py

@@ -84,7 +84,8 @@ def visit_Call(self, node):
  # This will not visit Flask in Flask(__name__) but it will visit request in `request.args.get()
  if not isinstance(node.func, ast.Name):
  self.visit(node.func)
- for arg in itertools.chain(node.args, node.keywords):
+ for arg_node in itertools.chain(node.args, node.keywords):
+ arg = arg_node.value if isinstance(arg_node, ast.keyword) else arg_node
  if isinstance(arg, ast.Call):
  if isinstance(arg.func, ast.Name):
  # We can't just visit because we need to add 'ret_'

tests/helper_visitors/vars_visitor_test.py

@@ -45,6 +45,10 @@ def test_call5(self):
  self.assertEqual(vars.result, ['resp', 'ret_replace'])
 
  def test_call6(self):
+ vars = self.perform_vars_on_expression("resp = f(kw=g(a, b))")
+ self.assertEqual(vars.result, ['resp', 'ret_g'])
+
+ def test_call7(self):
  vars = self.perform_vars_on_expression("resp = make_response(html.replace.bar('{{ param }}', param))")
  self.assertEqual(vars.result, ['resp', 'ret_bar'])