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

Fix #1519 (Polish language books decoding error)

Browse Source
This commit is contained in:
Kovid Goyal 2009-01-01 22:36:03 -08:00
parent 57c8df9d68
commit 4f8315a5bb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/parallel.py
View File

@ -31,7 +31,7 @@ from threading import RLock, Thread, Event
from math import ceil from math import ceil
from calibre.ptempfile import PersistentTemporaryFile from calibre.ptempfile import PersistentTemporaryFile
from calibre import iswindows, detect_ncpus, isosx from calibre import iswindows, detect_ncpus, isosx, preferred_encoding
from calibre.utils.config import prefs from calibre.utils.config import prefs
DEBUG = False DEBUG = False
@ -614,8 +614,10 @@ class Job(object):
if isinstance(self.log, str): if isinstance(self.log, str):
self.log = unicode(self.log, 'utf-8', 'replace') self.log = unicode(self.log, 'utf-8', 'replace')
ans.extend(self.log.split('\n')) ans.extend(self.log.split('\n'))
return '<br>'.join(ans) ans = [x.decode(preferred_encoding, 'replace') if isinstance(x, 'str') else x for x in ans]
return u'<br>'.join(ans)
class ParallelJob(Job): class ParallelJob(Job):