mirror of
https://github.com/Leseratte10/acsm-calibre-plugin.git
synced 2024-12-23 01:34:36 +06:00
Don't hide import errors
This commit is contained in:
parent
aca0157004
commit
344b199694
@ -114,24 +114,16 @@ class DeACSM(FileTypePlugin):
|
|||||||
from calibre_plugins.deacsm.libadobe import VAR_HOBBES_VERSION, createDeviceKeyFile, update_account_path
|
from calibre_plugins.deacsm.libadobe import VAR_HOBBES_VERSION, createDeviceKeyFile, update_account_path
|
||||||
from calibre_plugins.deacsm.libadobeAccount import createDeviceFile, createUser, signIn, activateDevice
|
from calibre_plugins.deacsm.libadobeAccount import createDeviceFile, createUser, signIn, activateDevice
|
||||||
except:
|
except:
|
||||||
try:
|
from libadobe import VAR_HOBBES_VERSION, createDeviceKeyFile, update_account_path
|
||||||
from libadobe import VAR_HOBBES_VERSION, createDeviceKeyFile, update_account_path
|
from libadobeAccount import createDeviceFile, createUser, signIn, activateDevice
|
||||||
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()
|
|
||||||
|
|
||||||
# Fulfill:
|
# Fulfill:
|
||||||
try:
|
try:
|
||||||
from calibre_plugins.deacsm.libadobe import sendHTTPRequest
|
from calibre_plugins.deacsm.libadobe import sendHTTPRequest
|
||||||
from calibre_plugins.deacsm.libadobeFulfill import buildRights, fulfill
|
from calibre_plugins.deacsm.libadobeFulfill import buildRights, fulfill
|
||||||
except:
|
except:
|
||||||
try:
|
from libadobe import sendHTTPRequest
|
||||||
from libadobe import sendHTTPRequest
|
from libadobeFulfill import buildRights, fulfill
|
||||||
from libadobeFulfill import buildRights, fulfill
|
|
||||||
except:
|
|
||||||
print("{0} v{1}: Error while importing Fulfillment stuff".format(PLUGIN_NAME, PLUGIN_VERSION))
|
|
||||||
traceback.print_exc()
|
|
||||||
|
|
||||||
import calibre_plugins.deacsm.prefs as prefs # type: ignore
|
import calibre_plugins.deacsm.prefs as prefs # type: ignore
|
||||||
deacsmprefs = prefs.DeACSM_Prefs()
|
deacsmprefs = prefs.DeACSM_Prefs()
|
||||||
@ -184,21 +176,13 @@ class DeACSM(FileTypePlugin):
|
|||||||
from calibre_plugins.deacsm.libadobe import sendHTTPRequest_DL2FILE
|
from calibre_plugins.deacsm.libadobe import sendHTTPRequest_DL2FILE
|
||||||
from calibre_plugins.deacsm.libadobeFulfill import buildRights, fulfill
|
from calibre_plugins.deacsm.libadobeFulfill import buildRights, fulfill
|
||||||
except:
|
except:
|
||||||
try:
|
from libadobe import sendHTTPRequest_DL2FILE
|
||||||
from libadobe import sendHTTPRequest_DL2FILE
|
from libadobeFulfill import buildRights, fulfill
|
||||||
from libadobeFulfill import buildRights, fulfill
|
|
||||||
except:
|
|
||||||
print("{0} v{1}: Error while importing Fulfillment stuff".format(PLUGIN_NAME, PLUGIN_VERSION))
|
|
||||||
traceback.print_exc()
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from calibre_plugins.deacsm.libpdf import patch_drm_into_pdf
|
from calibre_plugins.deacsm.libpdf import patch_drm_into_pdf
|
||||||
except:
|
except:
|
||||||
try:
|
from libpdf import patch_drm_into_pdf
|
||||||
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()
|
|
||||||
|
|
||||||
|
|
||||||
adobe_fulfill_response = etree.fromstring(replyData)
|
adobe_fulfill_response = etree.fromstring(replyData)
|
||||||
@ -301,13 +285,8 @@ class DeACSM(FileTypePlugin):
|
|||||||
from calibre_plugins.deacsm.libadobe import sendHTTPRequest
|
from calibre_plugins.deacsm.libadobe import sendHTTPRequest
|
||||||
from calibre_plugins.deacsm.libadobeFulfill import buildRights, fulfill
|
from calibre_plugins.deacsm.libadobeFulfill import buildRights, fulfill
|
||||||
except:
|
except:
|
||||||
try:
|
from libadobe import sendHTTPRequest
|
||||||
from libadobe import sendHTTPRequest
|
from libadobeFulfill import buildRights, fulfill
|
||||||
from libadobeFulfill import buildRights, fulfill
|
|
||||||
except:
|
|
||||||
print("{0} v{1}: Error while importing Fulfillment stuff".format(PLUGIN_NAME, PLUGIN_VERSION))
|
|
||||||
traceback.print_exc()
|
|
||||||
|
|
||||||
|
|
||||||
import calibre_plugins.deacsm.prefs as prefs # type: ignore
|
import calibre_plugins.deacsm.prefs as prefs # type: ignore
|
||||||
deacsmprefs = prefs.DeACSM_Prefs()
|
deacsmprefs = prefs.DeACSM_Prefs()
|
||||||
|
Loading…
Reference in New Issue
Block a user