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

More fixes for broken ODT files generated by mk4ht

Browse Source
This commit is contained in:
Kovid Goyal 2013-10-19 10:22:12 +05:30
parent b4f15bb8ca
commit 26c1fd0689
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/odt/input.py
View File

@ -26,7 +26,7 @@ class Extract(ODF2XHTML):
if not os.path.exists('Pictures'): if not os.path.exists('Pictures'):
os.makedirs('Pictures') os.makedirs('Pictures')
for name in zf.namelist(): for name in zf.namelist():
if name.startswith('Pictures'): if name.startswith('Pictures') and name not in {'Pictures', 'Pictures/'}:
data = zf.read(name) data = zf.read(name)
with open(name, 'wb') as f: with open(name, 'wb') as f:
f.write(data) f.write(data)

1
src/odf/odfmanifest.py
View File

@ -97,6 +97,7 @@ def manifestlist(manifestxml):
inpsrc = InputSource() inpsrc = InputSource()
inpsrc.setByteStream(StringIO(manifestxml)) inpsrc.setByteStream(StringIO(manifestxml))
parser.setFeature(handler.feature_external_ges, False) # Changed by Kovid to ignore external DTDs
parser.parse(inpsrc) parser.parse(inpsrc)
return odhandler.manifest return odhandler.manifest

1
src/odf/opendocument.py
View File

@ -598,6 +598,7 @@ def __loadxmlparts(z, manifest, doc, objectpath):
inpsrc = InputSource() inpsrc = InputSource()
inpsrc.setByteStream(StringIO(xmlpart)) inpsrc.setByteStream(StringIO(xmlpart))
parser.setFeature(handler.feature_external_ges, False) # Changed by Kovid to ignore external DTDs
parser.parse(inpsrc) parser.parse(inpsrc)
del doc._parsing del doc._parsing
except KeyError, v: pass except KeyError, v: pass