From 6e09039c08ca3eeadc806314d6a4efce5d47a5a6 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 14 May 2015 17:21:26 +0530 Subject: [PATCH] DOCX Output: Fix handling of table rows without enclosing table body --- src/calibre/ebooks/docx/writer/from_html.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/docx/writer/from_html.py b/src/calibre/ebooks/docx/writer/from_html.py index 7454cbb6bf..39e6d19470 100644 --- a/src/calibre/ebooks/docx/writer/from_html.py +++ b/src/calibre/ebooks/docx/writer/from_html.py @@ -322,8 +322,9 @@ class Blocks(object): pos = self.pos if pos is None else pos block = self.all_blocks[pos] del self.all_blocks[pos] - if self.block_map: - del self.items[self.block_map.pop(block)] + bpos = self.block_map.pop(block, None) + if bpos is not None: + del self.items[bpos] else: items = self.items if block.parent_items is None else block.parent_items items.remove(block) @@ -410,6 +411,7 @@ class Convert(object): self.current_link = self.current_lang = None for item in self.oeb.spine: + self.log.debug('Processing', item.href) self.process_item(item) if self.add_toc: self.links_manager.process_toc_links(self.oeb)