From ea99f5223ca4377293dddb4c38fc32cf50536268 Mon Sep 17 00:00:00 2001 From: gryf Date: Thu, 23 Apr 2020 20:10:35 +0200 Subject: [PATCH] Removing not needed excpetion class ConversionUserFeedBack --- ebook_converter/ebooks/conversion/__init__.py | 20 ------------------- ebook_converter/ebooks/conversion/cli.py | 12 +---------- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/ebook_converter/ebooks/conversion/__init__.py b/ebook_converter/ebooks/conversion/__init__.py index 8e83c72..e69de29 100644 --- a/ebook_converter/ebooks/conversion/__init__.py +++ b/ebook_converter/ebooks/conversion/__init__.py @@ -1,20 +0,0 @@ -class ConversionUserFeedBack(Exception): - - def __init__(self, title, msg, level='info', det_msg=''): - ''' Show a simple message to the user - - :param title: The title (very short description) - :param msg: The message to show the user - :param level: Must be one of 'info', 'warn' or 'error' - :param det_msg: Optional detailed message to show the user - ''' - import json - Exception.__init__(self, json.dumps({'msg':msg, 'level':level, - 'det_msg':det_msg, 'title':title})) - self.title, self.msg, self.det_msg = title, msg, det_msg - self.level = level - - -# Ensure exception uses fully qualified name as this is used to detect it in -# the GUI. -ConversionUserFeedBack.__name__ = 'ebook_converter.ebooks.conversion.ConversionUserFeedBack' diff --git a/ebook_converter/ebooks/conversion/cli.py b/ebook_converter/ebooks/conversion/cli.py index 9eac4cd..36627c2 100644 --- a/ebook_converter/ebooks/conversion/cli.py +++ b/ebook_converter/ebooks/conversion/cli.py @@ -9,7 +9,6 @@ from ebook_converter.utils.config import OptionParser from ebook_converter.utils.logging import Log from ebook_converter.customize.conversion import OptionRecommendation from ebook_converter import patheq -from ebook_converter.ebooks.conversion import ConversionUserFeedBack from ebook_converter.utils.localization import localize_user_manual_link @@ -394,16 +393,7 @@ def main(args=sys.argv): if n.dest] plumber.merge_ui_recommendations(recommendations) - try: - plumber.run() - except ConversionUserFeedBack as e: - ll = {'info': log.info, 'warn': log.warn, - 'error':log.error}.get(e.level, log.info) - ll(e.title) - if e.det_msg: - log.debug(e.detmsg) - ll(e.msg) - raise SystemExit(1) + plumber.run() log(_('Output saved to'), ' ', plumber.output)