pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a bug which caused self.implementations to be able to return None instead of [] if no implementations were provided by a plugin

Browse source
This commit is contained in:
Gina Häußge 2015-01-30 18:04:15 +01:00
parent e6a0019cc7
commit 86734076e0
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/octoprint/plugin/core.py
View file

@ -72,7 +72,7 @@ class PluginInfo(object):
@property
def name(self):
return self._get_instance_attribute(self.__class__.attr_name, default=(self._name, self.key))
return self._get_instance_attribute(self.__class__.attr_name, defaults=(self._name, self.key))
@property
def description(self):
@ -114,15 +114,13 @@ class PluginInfo(object):
def init(self):
return self._get_instance_attribute(self.__class__.attr_init, default=lambda: True)
def _get_instance_attribute(self, attr, default=None):
def _get_instance_attribute(self, attr, default=None, defaults=None):
if not hasattr(self.instance, attr):
if isinstance(default, (tuple, list)):
for value in default:
if defaults is not None:
for value in defaults:
if value is not None:
return value
return None
else:
return default
return default
return getattr(self.instance, attr)