Fix #852438 (Error when connecting my Bebook Club)

This commit is contained in:
Kovid Goyal 2011-09-19 09:36:53 -06:00
parent 94af5388e1
commit 6f07f3dc20
2 changed files with 2 additions and 2 deletions

View File

@ -31,7 +31,7 @@ def metadata_from_formats(formats, force_read_metadata=False, pattern=None):
try:
return _metadata_from_formats(formats, force_read_metadata, pattern)
except:
mi = metadata_from_filename(list(iter(formats), pattern)[0])
mi = metadata_from_filename(list(iter(formats))[0], pat=pattern)
if not mi.authors:
mi.authors = [_('Unknown')]
return mi

View File

@ -87,7 +87,7 @@ class DeviceJob(BaseJob): # {{{
self.failed = True
ex = as_unicode(err)
self._details = ex + '\n\n' + \
traceback.format_exc()
force_unicode(traceback.format_exc())
self.exception = err
finally:
self.job_done()