Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

ensure that the Python template returns a string

Browse Source
This commit is contained in:
un-pogaz 2022-10-13 16:21:10 +02:00
parent 8d42c86479
commit 28db54436b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/utils/formatter.py
View File

@ -1602,11 +1602,16 @@ class TemplateFormatter(string.Formatter):
db=get_database(self.book, get_database(self.book, None)), db=get_database(self.book, get_database(self.book, None)),
globals=self.global_vars, globals=self.global_vars,
arguments=arguments) arguments=arguments)
return compiled_template(self.book, self.python_context_object) rslt = compiled_template(self.book, self.python_context_object)
except Exception as e: except Exception as e:
ss = traceback.extract_tb(exc_info()[2])[-1] ss = traceback.extract_tb(exc_info()[2])[-1]
raise ValueError(_('Error in function {0} on line {1} : {2} - {3}').format( raise ValueError(_('Error in function {0} on line {1} : {2} - {3}').format(
ss.name, ss.lineno, type(e).__name__, str(e))) ss.name, ss.lineno, type(e).__name__, str(e)))
if not isinstance(rslt, str):
raise ValueError(_('The Python template does not return a string'))
return rslt
def compile_python_template(self, template): def compile_python_template(self, template):
def replace_func(mo): def replace_func(mo):