From c018244afe0b7c63a0a8d08158525c3de9e19a60 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Fri, 27 Jun 2014 11:06:09 +0200 Subject: [PATCH 1/2] Add missing parameter to unsafe_format to prevent exceptions in save-to-disk --- 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 6fad97d312..8bcf0d6477 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -499,7 +499,8 @@ class TemplateFormatter(string.Formatter): ########## a formatter that throws exceptions ############ - def unsafe_format(self, fmt, kwargs, book): + def unsafe_format(self, fmt, kwargs, book, strip_results=True): + self.strip_results = strip_results self.column_name = self.template_cache = None self.kwargs = kwargs self.book = book From 324a84f096b25fd37984cb105d55f207eb7fbd7a Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Fri, 27 Jun 2014 11:14:09 +0200 Subject: [PATCH 2/2] Respect the strip_results parameter in unsafe_format. No one uses it so there isn't any rush to incorporate this push. --- 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 8bcf0d6477..82d2777830 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -506,7 +506,7 @@ class TemplateFormatter(string.Formatter): self.book = book self.composite_values = {} self.locals = {} - return self.evaluate(fmt, [], kwargs).strip() + return self.evaluate(fmt, [], kwargs) ########## a formatter guaranteed not to throw an exception ############