From c14aea2812fd2be94998bdb174e9a4681aeea394 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Sat, 7 Dec 2019 14:42:23 +0100 Subject: types: Annotate mparser.py This also fixes that the keys in ArgumentNode.kwargs are all of the type BaseNode now. Before this commit, it was possible that both strings and Nodes where used as keys. --- mesonbuild/ast/printer.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'mesonbuild/ast/printer.py') diff --git a/mesonbuild/ast/printer.py b/mesonbuild/ast/printer.py index f245a36..033b1d5 100644 --- a/mesonbuild/ast/printer.py +++ b/mesonbuild/ast/printer.py @@ -143,7 +143,7 @@ class AstPrinter(AstVisitor): node.value.accept(self) def visit_ForeachClauseNode(self, node: mparser.ForeachClauseNode): - varnames = [x.value for x in node.varnames] + varnames = [x for x in node.varnames] self.append_padded('foreach', node) self.append_padded(', '.join(varnames), node) self.append_padded(':', node) @@ -192,10 +192,7 @@ class AstPrinter(AstVisitor): if break_args: self.newline() for key, val in node.kwargs.items(): - if isinstance(key, str): - self.append(key, node) - else: - key.accept(self) + key.accept(self) self.append_padded(':', node) val.accept(self) self.append(', ', node) -- cgit v1.1