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

py3 compat: Fix diff on non HTML files not working

Browse Source
This commit is contained in:
Kovid Goyal 2021-01-05 08:42:25 +05:30
parent a6840fb462
commit 78e967edc6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/tweak_book/diff/main.py
View File

@ -118,6 +118,8 @@ def get_decoded_raw(name):
enc = 'utf-8' enc = 'utf-8'
else: else:
enc = force_encoding(raw, verbose=True) enc = force_encoding(raw, verbose=True)
if isinstance(enc, bytes):
enc = enc.decode('utf-8', 'ignore')
try: try:
raw = raw.decode(enc) raw = raw.decode(enc)
except (LookupError, ValueError): except (LookupError, ValueError):