From bc070de564d4ae492d8d4a3ffa408680a0ebb899 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 22 Apr 2014 15:55:53 +0530 Subject: [PATCH] Fix spurious error message due to encoding bug in error handler. See #1311025 (Error when editing author metadata the first time) --- src/calibre/gui2/metadata/basic_widgets.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py index 19006920de..cedb4e8eaa 100644 --- a/src/calibre/gui2/metadata/basic_widgets.py +++ b/src/calibre/gui2/metadata/basic_widgets.py @@ -26,7 +26,7 @@ from calibre.gui2 import (file_icon_provider, UNDEFINED_QDATETIME, from calibre.gui2.complete2 import EditWithComplete from calibre.utils.date import ( local_tz, qt_to_dt, as_local_time, UNDEFINED_DATE, is_date_undefined) -from calibre import strftime +from calibre import strftime, force_unicode from calibre.ebooks import BOOK_EXTENSIONS from calibre.customize.ui import run_plugins_on_import from calibre.utils.date import utcfromtimestamp @@ -298,7 +298,7 @@ class AuthorsEdit(EditWithComplete): error_dialog(self, _('Permission denied'), _('Could not change the on disk location of this' ' book. Is it open in another program?'), - det_msg=p+traceback.format_exc(), show=True) + det_msg=p+force_unicode(traceback.format_exc()), show=True) return False raise return True