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

MOBI output: Dont fail if input document contains invalid % based lengths. Fixes #1956097 [news download crashes with TypeError: '<' not supported between instances of 'float' and 'str'](https://bugs.launchpad.net/calibre/+bug/1956097)

Browse Source
This commit is contained in:
Kovid Goyal 2021-12-31 20:48:14 +05:30
parent ce138b1744
commit fdbffe60fe
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/ebooks/mobi/mobiml.py
View File

@ -6,14 +6,17 @@ __license__ = 'GPL v3'
__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.cam>' __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.cam>'
import copy import copy
import re
import numbers import numbers
import re
from contextlib import suppress
from lxml import etree from lxml import etree
from calibre.ebooks.oeb.base import namespace, barename
from calibre.ebooks.oeb.base import XHTML, XHTML_NS, urlnormalize from calibre.ebooks.mobi.utils import convert_color_for_font_tag
from calibre.ebooks.oeb.base import (
XHTML, XHTML_NS, barename, namespace, urlnormalize
)
from calibre.ebooks.oeb.stylizer import Stylizer from calibre.ebooks.oeb.stylizer import Stylizer
from calibre.ebooks.oeb.transforms.flatcss import KeyMapper from calibre.ebooks.oeb.transforms.flatcss import KeyMapper
from calibre.ebooks.mobi.utils import convert_color_for_font_tag
from calibre.utils.imghdr import identify from calibre.utils.imghdr import identify
from polyglot.builtins import string_or_bytes from polyglot.builtins import string_or_bytes
@ -55,7 +58,8 @@ def convert_margin(style, which):
ans = asfloat(style[which]) ans = asfloat(style[which])
raw = style._get(which) raw = style._get(which)
if isinstance(raw, str) and '%' in raw: if isinstance(raw, str) and '%' in raw:
ans = min(style._unit_convert(raw, base=600), ans) with suppress(TypeError):
ans = min(style._unit_convert(raw, base=600), ans)
return ans return ans