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

Cleaner fix for #2696.

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2009-06-28 10:04:21 -04:00
parent aa54195d62
commit 9e3156782d
1 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/calibre/ebooks/lit/writer.py
View File

@ -161,7 +161,7 @@ class ReBinary(object):
def tree_to_binary(self, elem, nsrmap=NSRMAP, parents=[],
inhead=False, preserve=False):
if not isinstance(elem.tag, basestring):
self.write(etree.tostring(elem))
# Don't emit any comments or raw entities
return
nsrmap = copy.copy(nsrmap)
attrib = dict(elem.attrib)
@ -308,31 +308,6 @@ class LitWriter(object):
else:
self._logger.warn('No suitable cover image found.')
# Remove comments because they are not supported by LIT HTML
for item in oeb.spine:
for elem in item.data.getiterator():
if isinstance(elem, etree._Comment):
tail = elem.tail
parent = elem.getparent()
index = parent.index(elem)
text = u''
if index == 0:
if parent.text:
text += parent.text
if tail:
text += tail
parent.text = text
else:
prev = parent[index-1]
text = u''
if prev.tail:
text += prev.tail
if tail:
text += tail
prev.tail = text
parent.remove(elem)
def __call__(self, oeb, path):
if hasattr(path, 'write'):
return self._dump_stream(oeb, path)
@ -734,5 +709,3 @@ class LitWriter(object):
ichunk = ''.join(['AOLI', pack('<IQ', rem, len(dchunks)),
ichunk.getvalue(), ('\0' * pad), pack('<H', len(dchunks))])
return dcounts, dchunks, ichunk