mirror of
git://github.com/kovidgoyal/calibre.git
synced 2026-04-25 12:13:18 +02:00
Fix #5337 (Conversion Error / NotImplementedError failure on custom news fetch)
This commit is contained in:
parent
54e524c7e1
commit
8a759d7738
1 changed files with 6 additions and 0 deletions
|
|
@ -96,6 +96,8 @@ def __init__(self, css, namespaces=XPNSMAP):
|
|||
path = css_to_xpath(css)
|
||||
except UnicodeEncodeError: # Bug in css_to_xpath
|
||||
path = '/'
|
||||
except NotImplementedError: # Probably a subselect like :hover
|
||||
path = '/'
|
||||
path = self.LOCAL_NAME_RE.sub(r"local-name() = '", path)
|
||||
etree.XPath.__init__(self, path, namespaces=namespaces)
|
||||
self.css = css
|
||||
|
|
@ -534,6 +536,8 @@ def width(self):
|
|||
result = base
|
||||
else:
|
||||
result = self._unit_convert(width, base=base)
|
||||
if isinstance(result, (unicode, str, bytes)):
|
||||
result = self._profile.width
|
||||
self._width = result
|
||||
return self._width
|
||||
|
||||
|
|
@ -555,6 +559,8 @@ def height(self):
|
|||
result = base
|
||||
else:
|
||||
result = self._unit_convert(height, base=base)
|
||||
if isinstance(result, (unicode, str, bytes)):
|
||||
result = self._profile.height
|
||||
self._height = result
|
||||
return self._height
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue