From 4f8315a5bbe44f6259892dd1ae60e24b979188a8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Jan 2009 22:36:03 -0800
Subject: [PATCH] Fix #1519 (Polish language books decoding error)

---
 src/calibre/parallel.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/calibre/parallel.py b/src/calibre/parallel.py
index 0b543ea27f..339bdc761b 100644
--- a/src/calibre/parallel.py
+++ b/src/calibre/parallel.py
@@ -31,7 +31,7 @@ from threading import RLock, Thread, Event
 from math import ceil
 
 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
 
 DEBUG = False
@@ -614,8 +614,10 @@ class Job(object):
             if isinstance(self.log, str):
                 self.log = unicode(self.log, 'utf-8', 'replace')
             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):