Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-03-05 18:53:31 +01:00
Code Issues Projects Releases Wiki Activity

Fix printing of tracebacks broken when third party plugins with non-UTF-8 source code present

Browse source
This commit is contained in:
Kovid Goyal 2020-11-04 08:37:15 +05:30
parent 37fee2b5b2
commit 6ba70b06aa
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/calibre/customize/zipplugin.py
View file

@ -164,7 +164,11 @@ def get_source_as_bytes(self, fullname=None):
return src
def get_source(self, fullname=None):
return self.get_source_as_bytes(fullname).decode('utf-8-sig').replace('\r\n', '\n')
raw = self.get_source_as_bytes(fullname)
try:
return raw.decode('utf-8-sig', 'replace').replace('\r\n', '\n')
except Exception:
return ''
def get_filename(self, fullname):
return self.filename