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 #7560 (UnicodeDecodeError while Fetching Metadata (0.7.28))

Browse Source
This commit is contained in:
Kovid Goyal 2010-11-16 08:17:43 -07:00
parent fee80b5cf2
commit a6286dcfda
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/dialogs/fetch_metadata.py
View File

@ -14,7 +14,7 @@ from PyQt4.QtGui import QDialog, QItemSelectionModel
from calibre.gui2.dialogs.fetch_metadata_ui import Ui_FetchMetadata from calibre.gui2.dialogs.fetch_metadata_ui import Ui_FetchMetadata
from calibre.gui2 import error_dialog, NONE, info_dialog, config from calibre.gui2 import error_dialog, NONE, info_dialog, config
from calibre.gui2.widgets import ProgressIndicator from calibre.gui2.widgets import ProgressIndicator
from calibre import strftime from calibre import strftime, force_unicode
from calibre.customize.ui import get_isbndb_key, set_isbndb_key from calibre.customize.ui import get_isbndb_key, set_isbndb_key
_hung_fetchers = set([]) _hung_fetchers = set([])
@ -179,7 +179,7 @@ class FetchMetadata(QDialog, Ui_FetchMetadata):
self.terminate() self.terminate()
return self.queue_reject.emit() return self.queue_reject.emit()
self.model = Matches(self.fetcher.results) self.model = Matches(self.fetcher.results)
warnings = [(x[0], unicode(x[1])) for x in \ warnings = [(x[0], force_unicode(x[1])) for x in \
self.fetcher.exceptions if x[1] is not None] self.fetcher.exceptions if x[1] is not None]
if warnings: if warnings:
warnings='<br>'.join(['<b>%s</b>: %s'%(name, exc) for name,exc in warnings]) warnings='<br>'.join(['<b>%s</b>: %s'%(name, exc) for name,exc in warnings])