l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[core/module] Add fallback for user module loading

Browse source 
If importlib.machinery is not present, fall back to importlib.util to
load the module by its absolute name.

hopefully fixes #763
This commit is contained in:
tobi-wan-kenobi 2021-03-09 19:12:59 +01:00
parent 6d1536ca80
commit 7d0d1455c8
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
bumblebee_status/core/module.py
View file

@ -17,6 +17,22 @@ except Exception as e:
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
def import_user(module_short, config, theme):
usermod = os.path.expanduser("~/.config/bumblebee-status/modules/{}.py".format(module_short))
if os.path.exists(usermod):
if hasattr(importlib, "machinery"):
log.debug("importing {} from user via machinery".format(module_short))
mod = importlib.machinery.SourceFileLoader("modules.{}".format(module_short),
os.path.expanduser(usermod)).load_module()
return getattr(mod, "Module")(config, theme)
else:
log.debug("importing {} from user via importlib.util".format(module_short))
spec = importlib.util.spec_from_file_location("modules.{}".format(module_short), usermod)
mod = importlib.util.module_from_spec(spec)
spec.loader.exec_module(mod)
return mod.Module(config, theme)
raise ImportError("not found")
"""Loads a module by name """Loads a module by name
:param module_name: Name of the module to load :param module_name: Name of the module to load
@ -44,16 +60,11 @@ def load(module_name, config=core.config.Config([]), theme=None):
log.debug("importing {} from contrib".format(module_short)) log.debug("importing {} from contrib".format(module_short))
return getattr(mod, "Module")(config, theme) return getattr(mod, "Module")(config, theme)
except ImportError as e: except ImportError as e:
usermod = os.path.expanduser("~/.config/bumblebee-status/modules/{}.py".format(module_short)) try:
if os.path.exists(usermod): log.warning("failed to import {} from system: {}".format(module_short, e))
try: return import_user(module_short, config, theme)
log.warning("failed to import {} from system: {}".format(module_short, e)) except ImportError as e:
mod = importlib.machinery.SourceFileLoader("modules.{}".format(module_short), log.fatal("import failed: {}".format(e))
os.path.expanduser(usermod)).load_module()
log.debug("importing {} from user".format(module_short))
return getattr(mod, "Module")(config, theme)
except ImportError as e:
log.fatal("import failed: {}".format(e))
log.fatal("failed to import {}".format(module_short)) log.fatal("failed to import {}".format(module_short))
return Error(config=config, module=module_name, error="unable to load module") return Error(config=config, module=module_name, error="unable to load module")