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

Add a flag to abort when a psedo element is missing

Browse Source
This commit is contained in:
Kovid Goyal 2016-04-12 16:20:34 +05:30
parent 0f1fbf0a8c
commit 825905a092
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/oeb/polish/cascade.py
View File

@ -237,10 +237,14 @@ def resolve_property(style_map, elem, name):
q = q.getparent() if inheritable else None q = q.getparent() if inheritable else None
return defvals().get(name) return defvals().get(name)
def resolve_pseudo_property(style_map, pseudo_style_map, elem, prop, name): def resolve_pseudo_property(style_map, pseudo_style_map, elem, prop, name, abort_on_missing=False):
sub_map = pseudo_style_map.get(elem) sub_map = pseudo_style_map.get(elem)
if abort_on_missing and sub_map is None:
return None
if sub_map is not None: if sub_map is not None:
prop_map = sub_map.get(prop) prop_map = sub_map.get(prop)
if abort_on_missing and prop_map is None:
return None
if prop_map is not None: if prop_map is not None:
val = prop_map.get(name) val = prop_map.get(name)
if val is not None: if val is not None:

11
src/calibre/ebooks/oeb/polish/tests/cascade.py
View File

@ -72,9 +72,13 @@ class CascadeTest(BaseTest):
val = type('')(DEFAULTS[name]) val = type('')(DEFAULTS[name])
self.assertEqual(val, ans.cssText) self.assertEqual(val, ans.cssText)
def test_pseudo_property(select, resolve_pseudo_property, selector, prop, name, val=None): def test_pseudo_property(select, resolve_pseudo_property, selector, prop, name, val=None, abort_on_missing=False):
elem = next(select(selector)) elem = next(select(selector))
ans = resolve_pseudo_property(elem, prop, name) ans = resolve_pseudo_property(elem, prop, name, abort_on_missing=abort_on_missing)
if abort_on_missing:
if val is None:
self.assertTrue(ans is None)
return
if val is None: if val is None:
val = type('')(DEFAULTS[name]) val = type('')(DEFAULTS[name])
self.assertEqual(val, ans.cssText) self.assertEqual(val, ans.cssText)
@ -125,4 +129,5 @@ class CascadeTest(BaseTest):
t('p', 'before', 'content', 'xxx') t('p', 'before', 'content', 'xxx')
t('p', 'before', 'margin-top', '0') t('p', 'before', 'margin-top', '0')
t('p', 'before', 'font-weight', 'bold') t('p', 'before', 'font-weight', 'bold')
t('p', 'first-letter', 'content', 'normal') t('p', 'first-letter', 'content')
t('p', 'first-letter', 'content', abort_on_missing=True)