diff --git a/src/calibre/ebooks/docx/writer/from_html.py b/src/calibre/ebooks/docx/writer/from_html.py index c7858bb25f..ee81df8835 100644 --- a/src/calibre/ebooks/docx/writer/from_html.py +++ b/src/calibre/ebooks/docx/writer/from_html.py @@ -171,14 +171,11 @@ class Convert(object): self.styles_manager = StylesManager() self.images_manager = ImagesManager(self.oeb, self.docx.document_relationships) - try: - for item in self.oeb.spine: - self.process_item(item) + for item in self.oeb.spine: + self.process_item(item) - self.styles_manager.finalize(self.blocks) - self.write() - finally: - self.images_manager.cleanup() + self.styles_manager.finalize(self.blocks) + self.write() def process_item(self, item): stylizer = self.svg_rasterizer.stylizer_cache.get(item) diff --git a/src/calibre/ebooks/docx/writer/images.py b/src/calibre/ebooks/docx/writer/images.py index fbb8bbbc19..9b8e1a7d5a 100644 --- a/src/calibre/ebooks/docx/writer/images.py +++ b/src/calibre/ebooks/docx/writer/images.py @@ -7,7 +7,7 @@ __license__ = 'GPL v3' __copyright__ = '2015, Kovid Goyal ' import os -import shutil, posixpath +import posixpath from collections import namedtuple from functools import partial from future_builtins import map @@ -17,7 +17,6 @@ from lxml import etree from calibre.ebooks.oeb.base import urlunquote from calibre.ebooks.docx.names import makeelement, namespaces from calibre.ebooks.docx.images import pt_to_emu -from calibre.ptempfile import PersistentTemporaryDirectory from calibre.utils.filenames import ascii_filename from calibre.utils.magick.draw import identify_data @@ -37,20 +36,8 @@ class ImagesManager(object): self.images = {} self.seen_filenames = set() self.document_relationships = document_relationships - self._tdir = None self.count = 0 - @property - def tdir(self): - if self._tdir is None: - self._tdir = PersistentTemporaryDirectory(suffix='_docx_output_images') - return self._tdir - - def cleanup(self): - if self._tdir is not None: - shutil.rmtree(self._tdir) - self._tdir = None - def add_image(self, img, block, stylizer): src = img.get('src') if not src: