More fixes for broken ODT files generated by mk4ht

src/calibre/ebooks/odt/input.py

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

src/odf/odfmanifest.py

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

src/odf/opendocument.py

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