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 regression that broke the unhandled exception handler

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-13 15:34:12 +05:30
parent 880b3acc1d
commit b68dbb2bf5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/gui2/main_window.py
View File

@ -5,14 +5,14 @@ __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
import traceback, sys, gc, weakref import sys, gc, weakref
from io import BytesIO from io import BytesIO
from PyQt5.Qt import (QMainWindow, QTimer, QAction, QMenu, QMenuBar, QIcon, from PyQt5.Qt import (QMainWindow, QTimer, QAction, QMenu, QMenuBar, QIcon,
QObject) QObject)
from calibre.utils.config import OptionParser from calibre.utils.config import OptionParser
from calibre.gui2 import error_dialog from calibre.gui2 import error_dialog
from calibre import prints, force_unicode from calibre import prints, force_unicode, as_unicode
def option_parser(usage='''\ def option_parser(usage='''\
@ -133,6 +133,7 @@ class MainWindow(QMainWindow):
def unhandled_exception(self, type, value, tb): def unhandled_exception(self, type, value, tb):
if type is KeyboardInterrupt: if type is KeyboardInterrupt:
return return
import traceback
try: try:
sio = BytesIO() sio = BytesIO()
try: try:
@ -146,7 +147,7 @@ class MainWindow(QMainWindow):
fe = sio.getvalue() fe = sio.getvalue()
prints(fe, file=sys.stderr) prints(fe, file=sys.stderr)
fe = force_unicode(fe) fe = force_unicode(fe)
msg = '<b>%s</b>:'%type.__name__ + force_unicode(value) msg = '<b>%s</b>:'%type.__name__ + as_unicode(value)
error_dialog(self, _('Unhandled exception'), msg, det_msg=fe, error_dialog(self, _('Unhandled exception'), msg, det_msg=fe,
show=True) show=True)
except BaseException: except BaseException: