Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-09 11:14:02 +02:00
Code Issues Projects Releases Wiki Activity

Fix parsing of assign() template function

Browse source 
This fixes a regression from commit
bde8cd5e65, which allowed expression lists
as function arguments. However, assign() still expects simple expression
as its first argument. I don't think allowing expression list there
makes much sense, so let's restrict this.
This commit is contained in:
David Tardon 2021-10-18 21:22:34 +02:00
parent 1796df09b4
commit 22b32638e8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/calibre/utils/formatter.py
View file

@ -540,8 +540,8 @@ def call_expression(self, name, arguments):
lambda ln, args: IfNode(ln, args[0], (args[1],), (args[2],))),
'first_non_empty': (lambda args: len(args) == 1,
lambda ln, args: FirstNonEmptyNode(ln, args)),
'assign': (lambda args: len(args) == 2 and args[0].node_type == Node.NODE_RVALUE,
lambda ln, args: AssignNode(ln, args[0].name, args[1])),
'assign': (lambda args: len(args) == 2 and len(args[0]) == 1 and args[0][0].node_type == Node.NODE_RVALUE,
lambda ln, args: AssignNode(ln, args[0][0].name, args[1])),
'contains': (lambda args: len(args) == 4,
lambda ln, args: ContainsNode(ln, args)),
'character': (lambda args: len(args) == 1,