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

[core/module] fix load error when no user module exists

Browse source
This commit is contained in:
tobi-wan-kenobi 2021-01-17 15:17:14 +01:00
parent 21ded8f640
commit 45c0a382c9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bumblebee_status/core/module.py
View file

@ -46,10 +46,13 @@ 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))
if not os.path.exists(usermod):
raise e
try: try:
log.warning("failed to import {} from system: {}".format(module_short, e)) log.warning("failed to import {} from system: {}".format(module_short, e))
mod = importlib.machinery.SourceFileLoader("modules.{}".format(module_short), mod = importlib.machinery.SourceFileLoader("modules.{}".format(module_short),
os.path.expanduser("~/.config/bumblebee-status/modules/{}.py".format(module_short))).load_module() os.path.expanduser(usermod)).load_module()
log.debug("importing {} from user".format(module_short)) log.debug("importing {} from user".format(module_short))
return getattr(mod, "Module")(config, theme) return getattr(mod, "Module")(config, theme)
except ImportError as e: except ImportError as e: