Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect error when viewing DRMed books on some windows systems

Browse Source
This commit is contained in:
Kovid Goyal 2020-05-26 08:41:52 +05:30
parent 136b627318
commit 2483c7c69b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/viewer/ui.py
View File

@ -48,7 +48,7 @@ from calibre.utils.ipc.simple_worker import WorkerError
from calibre.utils.iso8601 import parse_iso8601 from calibre.utils.iso8601 import parse_iso8601
from calibre.utils.monotonic import monotonic from calibre.utils.monotonic import monotonic
from calibre.utils.serialize import json_loads from calibre.utils.serialize import json_loads
from polyglot.builtins import as_bytes, iteritems, itervalues from polyglot.builtins import as_bytes, iteritems, itervalues, as_unicode
annotations_dir = os.path.join(viewer_config_dir, 'annots') annotations_dir = os.path.join(viewer_config_dir, 'annots')
@ -468,7 +468,7 @@ class EbookViewer(MainWindow):
self.web_view.clear_caches() self.web_view.clear_caches()
if not ok: if not ok:
self.setWindowTitle(self.base_window_title) self.setWindowTitle(self.base_window_title)
tb = data['tb'].strip() tb = as_unicode(data['tb'].strip(), errors='replace')
tb = re.split(r'^calibre\.gui2\.viewer\.convert_book\.ConversionFailure:\s*', tb, maxsplit=1, flags=re.M)[-1] tb = re.split(r'^calibre\.gui2\.viewer\.convert_book\.ConversionFailure:\s*', tb, maxsplit=1, flags=re.M)[-1]
last_line = tuple(tb.strip().splitlines())[-1] last_line = tuple(tb.strip().splitlines())[-1]
if last_line.startswith('calibre.ebooks.DRMError'): if last_line.startswith('calibre.ebooks.DRMError'):