Restructured plugin validity check

This commit is contained in:
Joel Collins 2018-12-11 14:34:36 +00:00
parent 9a2c585046
commit 14a4e3d909

View file

@ -91,8 +91,7 @@ class PluginMount(object):
Args: Args:
plugin_module: A loaded module to be attached. Module can be loaded using :py:meth:`openflexure_microscope.plugins.load_plugin` plugin_module: A loaded module to be attached. Module can be loaded using :py:meth:`openflexure_microscope.plugins.load_plugin`
""" """
if not hasattr(plugin_module, 'PLUGINS') or not isinstance(plugin_module.PLUGINS, dict): if hasattr(plugin_module, 'PLUGINS') and isinstance(plugin_module.PLUGINS, dict):
raise Exception("No falid PLUGINS dictionary found in {}".format(plugin_module))
for plugin_name, plugin_class in plugin_module.PLUGINS.items(): for plugin_name, plugin_class in plugin_module.PLUGINS.items():
@ -107,6 +106,8 @@ class PluginMount(object):
plugin_object.microscope = self.parent plugin_object.microscope = self.parent
print("Adding plugin: {}".format(plugin_name)) print("Adding plugin: {}".format(plugin_name))
else:
warnings.warn("No valid PLUGINS dictionary found in {}".format(plugin_module))
class MicroscopePlugin(): class MicroscopePlugin():