From 344b1996945dd269ad9e4c82f25d18396dbb985f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Perrin?= Date: Sat, 16 Oct 2021 20:39:09 +0100 Subject: [PATCH] Don't hide import errors --- calibre-plugin/__init__.py | 39 +++++++++----------------------------- 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index de7f627..b973c95 100644 --- a/calibre-plugin/__init__.py +++ b/calibre-plugin/__init__.py @@ -114,24 +114,16 @@ class DeACSM(FileTypePlugin): from calibre_plugins.deacsm.libadobe import VAR_HOBBES_VERSION, createDeviceKeyFile, update_account_path from calibre_plugins.deacsm.libadobeAccount import createDeviceFile, createUser, signIn, activateDevice except: - try: - from libadobe import VAR_HOBBES_VERSION, createDeviceKeyFile, update_account_path - from libadobeAccount import createDeviceFile, createUser, signIn, activateDevice - except: - print("{0} v{1}: Error while importing Account stuff".format(PLUGIN_NAME, PLUGIN_VERSION)) - traceback.print_exc() + from libadobe import VAR_HOBBES_VERSION, createDeviceKeyFile, update_account_path + from libadobeAccount import createDeviceFile, createUser, signIn, activateDevice # Fulfill: try: from calibre_plugins.deacsm.libadobe import sendHTTPRequest from calibre_plugins.deacsm.libadobeFulfill import buildRights, fulfill except: - try: - from libadobe import sendHTTPRequest - from libadobeFulfill import buildRights, fulfill - except: - print("{0} v{1}: Error while importing Fulfillment stuff".format(PLUGIN_NAME, PLUGIN_VERSION)) - traceback.print_exc() + from libadobe import sendHTTPRequest + from libadobeFulfill import buildRights, fulfill import calibre_plugins.deacsm.prefs as prefs # type: ignore deacsmprefs = prefs.DeACSM_Prefs() @@ -184,21 +176,13 @@ class DeACSM(FileTypePlugin): from calibre_plugins.deacsm.libadobe import sendHTTPRequest_DL2FILE from calibre_plugins.deacsm.libadobeFulfill import buildRights, fulfill except: - try: - from libadobe import sendHTTPRequest_DL2FILE - from libadobeFulfill import buildRights, fulfill - except: - print("{0} v{1}: Error while importing Fulfillment stuff".format(PLUGIN_NAME, PLUGIN_VERSION)) - traceback.print_exc() + from libadobe import sendHTTPRequest_DL2FILE + from libadobeFulfill import buildRights, fulfill try: from calibre_plugins.deacsm.libpdf import patch_drm_into_pdf except: - try: - from libpdf import patch_drm_into_pdf - except: - print("{0} v{1}: Error while importing PDF patch".format(PLUGIN_NAME, PLUGIN_VERSION)) - traceback.print_exc() + from libpdf import patch_drm_into_pdf adobe_fulfill_response = etree.fromstring(replyData) @@ -301,13 +285,8 @@ class DeACSM(FileTypePlugin): from calibre_plugins.deacsm.libadobe import sendHTTPRequest from calibre_plugins.deacsm.libadobeFulfill import buildRights, fulfill except: - try: - from libadobe import sendHTTPRequest - from libadobeFulfill import buildRights, fulfill - except: - print("{0} v{1}: Error while importing Fulfillment stuff".format(PLUGIN_NAME, PLUGIN_VERSION)) - traceback.print_exc() - + from libadobe import sendHTTPRequest + from libadobeFulfill import buildRights, fulfill import calibre_plugins.deacsm.prefs as prefs # type: ignore deacsmprefs = prefs.DeACSM_Prefs()