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

DOCX: Remove dependency on lxml > 3

Browse Source
This commit is contained in:
Kovid Goyal 2013-06-05 14:02:29 +05:30
parent 52349965c6
commit ced5676aa1
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/ebooks/docx/names.py
View File

@ -7,7 +7,6 @@ __license__ = 'GPL v3'
__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
import re import re
from future_builtins import map
from lxml.etree import XPath as X from lxml.etree import XPath as X
@ -99,7 +98,7 @@ def generate_anchor(name, existing):
return y return y
def children(elem, *args): def children(elem, *args):
return elem.iterchildren(*map(expand, args)) return XPath('|'.join('child::%s' % a for a in args))(elem)
def descendants(elem, *args): def descendants(elem, *args):
return elem.iterdescendants(*map(expand, args)) return XPath('|'.join('descendant::%s' % a for a in args))(elem)

6
src/calibre/ebooks/docx/to_html.py
View File

@ -16,7 +16,7 @@ from lxml.html.builder import (
from calibre.ebooks.docx.container import DOCX, fromstring from calibre.ebooks.docx.container import DOCX, fromstring
from calibre.ebooks.docx.names import ( from calibre.ebooks.docx.names import (
XPath, is_tag, XML, STYLES, NUMBERING, FONTS, get, generate_anchor, XPath, is_tag, XML, STYLES, NUMBERING, FONTS, get, generate_anchor,
descendants, ancestor, FOOTNOTES, ENDNOTES) descendants, ancestor, FOOTNOTES, ENDNOTES, children)
from calibre.ebooks.docx.styles import Styles, inherit, PageProperties from calibre.ebooks.docx.styles import Styles, inherit, PageProperties
from calibre.ebooks.docx.numbering import Numbering from calibre.ebooks.docx.numbering import Numbering
from calibre.ebooks.docx.fonts import Fonts from calibre.ebooks.docx.fonts import Fonts
@ -148,7 +148,7 @@ class Convert(object):
html_obj.set('class', cls) html_obj.set('class', cls)
if notes_header is not None: if notes_header is not None:
for h in self.body.iterchildren('h1', 'h2', 'h3'): for h in children(self.body, 'h1', 'h2', 'h3'):
notes_header.tag = h.tag notes_header.tag = h.tag
cls = h.get('class', None) cls = h.get('class', None)
if cls and cls != 'notes-header': if cls and cls != 'notes-header':
@ -262,7 +262,7 @@ class Convert(object):
elem.set('id', ans) elem.set('id', ans)
return ans return ans
for item in root.iterdescendants(*headings): for item in descendants(root, *headings):
lvl = plvl = item_level_map.get(item, None) lvl = plvl = item_level_map.get(item, None)
if lvl is None: if lvl is None:
continue continue