aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/klippy.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2018-06-14 12:00:55 -0400
committerKevin O'Connor <kevin@koconnor.net>2018-06-20 09:26:10 -0400
commitc60c9ee302d4c2437b3ffd4a7472ff0a1f73dc86 (patch)
tree95cb45ab800bddb67f7002efb96f5baabb916de3 /klippy/klippy.py
parent995367bd52c293cf82574471c656f94958f5b52e (diff)
downloadkutter-c60c9ee302d4c2437b3ffd4a7472ff0a1f73dc86.tar.gz
kutter-c60c9ee302d4c2437b3ffd4a7472ff0a1f73dc86.tar.xz
kutter-c60c9ee302d4c2437b3ffd4a7472ff0a1f73dc86.zip
klippy: try_load_module() should return the module loaded
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/klippy.py')
-rw-r--r--klippy/klippy.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/klippy/klippy.py b/klippy/klippy.py
index 8e7c5edc..e7588349 100644
--- a/klippy/klippy.py
+++ b/klippy/klippy.py
@@ -184,13 +184,13 @@ class Printer:
return eventtime + 1.
def try_load_module(self, config, section):
if section in self.objects:
- return
+ return self.objects[section]
module_parts = section.split()
module_name = module_parts[0]
py_name = os.path.join(os.path.dirname(__file__),
'extras', module_name + '.py')
if not os.path.exists(py_name):
- return
+ return None
mod = importlib.import_module('extras.' + module_name)
init_func = 'load_config'
if len(module_parts) > 1:
@@ -198,6 +198,7 @@ class Printer:
init_func = getattr(mod, init_func, None)
if init_func is not None:
self.objects[section] = init_func(config.getsection(section))
+ return self.objects[section]
def _read_config(self):
fileconfig = ConfigParser.RawConfigParser()
config_file = self.start_args['config_file']