From d1248f826074154a38b259e705dda0ecea757692 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 17 Sep 2019 07:03:47 +0530 Subject: [PATCH] Fix the re_group() and eval() formatter functions not working --- src/calibre/utils/formatter_functions.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py index 2ae8400d5b..ccf96b1015 100644 --- a/src/calibre/utils/formatter_functions.py +++ b/src/calibre/utils/formatter_functions.py @@ -321,7 +321,7 @@ class BuiltinEval(BuiltinFormatterFunction): 'template program mode.') def evaluate(self, formatter, kwargs, mi, locals, template): - from formatter import EvalFormatter + from calibre.utils.formatter import EvalFormatter template = template.replace('[[', '{').replace(']]', '}') return EvalFormatter().safe_format(template, locals, 'EVAL', None) @@ -644,7 +644,7 @@ class BuiltinReGroup(BuiltinFormatterFunction): "{series:'re_group($, \"(\\S* )(.*)\", \"[[$:uppercase()]]\", \"[[$]]\")'}") def evaluate(self, formatter, kwargs, mi, locals, val, pattern, *args): - from formatter import EvalFormatter + from calibre.utils.formatter import EvalFormatter def repl(mo): res = '' @@ -1348,7 +1348,7 @@ class BuiltinListReGroup(BuiltinFormatterFunction): def evaluate(self, formatter, kwargs, mi, locals, src_list, separator, include_re, search_re, *args): - from formatter import EvalFormatter + from calibre.utils.formatter import EvalFormatter l = [l.strip() for l in src_list.split(separator) if l.strip()] res = []