From 327e267177268d9c9cb3126c537f1192ea7794d3 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sun, 13 Sep 2020 14:43:27 +0100 Subject: [PATCH] Fix incorrect inlined raw_field function. Sorry about this. --- src/calibre/utils/formatter.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py index 76f7b155b8..f6d30128d7 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -388,13 +388,12 @@ class _Interpreter(object): try: name = self.expr(prog.expression) res = getattr(self.parent_book, name, None) - if res is None: - self.error(_('Unknown field {0}').format(name)) - if isinstance(res, list): - fm = self.parent_book.metadata_for_field(name) - if fm is None: - return ', '.join(res) - return fm['is_multiple']['list_to_ui'].join(res) + if res is not None: + if isinstance(res, list): + fm = self.parent_book.metadata_for_field(name) + if fm is None: + return ', '.join(res) + return fm['is_multiple']['list_to_ui'].join(res) return unicode_type(res) except ValueError as e: raise e