better implemenation to accomendate python 3

This commit is contained in:
chfw 2018-11-05 22:10:25 +00:00
parent 1e32e01558
commit 5f02119bfe
1 changed files with 5 additions and 3 deletions

View File

@ -11,6 +11,11 @@ import sys
import logging
from json import dumps, JSONEncoder
try:
ModuleNotFoundError
except NameError:
ModuleNotFoundError = ImportError
PY2 = sys.version_info[0] == 2
log = logging.getLogger(__name__)
@ -48,10 +53,7 @@ def do_import(plugin_module_name):
log.debug("found " + plugin_module_name)
return plugin_module
except ModuleNotFoundError:
log.info("Module %s is missing", plugin_module_name)
except ImportError:
log.exception("failed to import %s", plugin_module_name)
raise
def do_import_class(plugin_class):