From 4cd3bc037f8324847f9afc30b1a0b3ec3d8f0b8b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 26 Jun 2015 14:15:45 +0530 Subject: [PATCH] Diff tool: Fix a rare and difficult to trigger error (needs very long lines) --- src/calibre/gui2/tweak_book/diff/highlight.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/tweak_book/diff/highlight.py b/src/calibre/gui2/tweak_book/diff/highlight.py index db28583b13..b18ae8a0c7 100644 --- a/src/calibre/gui2/tweak_book/diff/highlight.py +++ b/src/calibre/gui2/tweak_book/diff/highlight.py @@ -39,7 +39,11 @@ class QtHighlighter(QTextDocument): cursor.insertText(block.text()) dest_block = cursor.block() c = QTextCursor(dest_block) - for af in block.layout().additionalFormats(): + try: + afs = block.layout().additionalFormats() + except AttributeError: + afs = () + for af in afs: start = dest_block.position() + af.start c.setPosition(start), c.setPosition(start + af.length, c.KeepAnchor) c.setCharFormat(af.format)