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

py3 compat: Fixes #1132 (Fix python 3 compatibility: template formatter: when no key is used in a template an …)

Browse Source
This commit is contained in:
Kovid Goyal 2020-04-11 16:19:05 +05:30
parent d61273b7cd
commit 9c99f3a101
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/ebooks/metadata/book/formatter.py
View File

@ -8,6 +8,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
from calibre.ebooks.metadata.book import TOP_LEVEL_IDENTIFIERS, ALL_METADATA_FIELDS from calibre.ebooks.metadata.book import TOP_LEVEL_IDENTIFIERS, ALL_METADATA_FIELDS
from calibre.utils.formatter import TemplateFormatter from calibre.utils.formatter import TemplateFormatter
from numbers import Number
class SafeFormat(TemplateFormatter): class SafeFormat(TemplateFormatter):
@ -16,7 +17,7 @@ class SafeFormat(TemplateFormatter):
TemplateFormatter.__init__(self) TemplateFormatter.__init__(self)
def get_value(self, orig_key, args, kwargs): def get_value(self, orig_key, args, kwargs):
if not orig_key: if not orig_key or isinstance(orig_key, Number):
return '' return ''
key = orig_key = orig_key.lower() key = orig_key = orig_key.lower()
if (key != 'title_sort' and key not in TOP_LEVEL_IDENTIFIERS and if (key != 'title_sort' and key not in TOP_LEVEL_IDENTIFIERS and
@ -42,5 +43,3 @@ class SafeFormat(TemplateFormatter):
if v == '': if v == '':
return '' return ''
return v return v