From 44e2e66c2c71db9b768a29bd7793647ff42429cf Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Fri, 14 Jan 2011 12:27:23 +0000
Subject: [PATCH] Fix regression in argument counting in the formatter

---
 src/calibre/utils/formatter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py
index e48d274c08..49b807ff1c 100644
--- a/src/calibre/utils/formatter.py
+++ b/src/calibre/utils/formatter.py
@@ -284,7 +284,7 @@ class TemplateFormatter(string.Formatter):
                     else:
                         args = self.arg_parser.scan(fmt[p+1:])[0]
                         args = [self.backslash_comma_to_comma.sub(',', a) for a in args]
-                    if (func.arg_count == 1 and (len(args) != 0)) or \
+                    if (func.arg_count == 1 and (len(args) != 1 or args[0])) or \
                             (func.arg_count > 1 and func.arg_count != len(args)+1):
                         raise ValueError('Incorrect number of arguments for function '+ fmt[0:p])
                     if func.arg_count == 1: