From 808f0bfd7a62f0128dbbbb7b992599812c7fa90e Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Wed, 10 Mar 2021 01:04:51 +0000 Subject: [PATCH] Fix regression in template language caused by commit bde8cd5: expression lists. The commit broke the arguments(), globals(), and set_globals() functions. --- src/calibre/utils/formatter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py index dd6f4df275..38de469c8e 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -616,7 +616,8 @@ class _Parser(object): return AssignNode(arguments[0].name, arguments[1]) if id_ == 'arguments' or id_ == 'globals' or id_ == 'set_globals': new_args = [] - for arg in arguments: + for arg_list in arguments: + arg = arg_list[0] if arg.node_type not in (Node.NODE_ASSIGN, Node.NODE_RVALUE): self.error(_("Parameters to '{}' must be " "variables or assignments").format(id_))