Merge branch 'devel' into dev/pluginLifecycleMgmt

Conflicts:
	src/octoprint/plugin/core.py
This commit is contained in:
Gina Häußge 2015-04-01 11:55:48 +02:00
commit f0b48a6b43

View file

@ -121,9 +121,7 @@ class PluginInfo(object):
self._url = url
self._license = license
self._validate()
def _validate(self):
def validate(self):
# if the plugin still uses __plugin_implementations__, log a deprecation warning and put the first
# item into __plugin_implementation__
if hasattr(self.instance, self.__class__.attr_implementations):
@ -552,6 +550,7 @@ class PluginManager(object):
def load_plugin(self, name, plugin):
try:
plugin.load()
plugin.validate()
self._activate_plugin(name, plugin)
except:
self.logger.exception("There was an error loading plugin %s" % name)