X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Finfo%2Fcommon.py;h=586b9e5739918d7233081c3d46c18cd85166d58c;hp=03de66a21579f83de77f4aa448dbd5318ad627cf;hb=83da2bf3963db3e4427bced3b4c0681e751e54da;hpb=0c14f7600de70baf5b3ee609288207dcdb65e1ae diff --git a/ipsilon/info/common.py b/ipsilon/info/common.py index 03de66a..586b9e5 100755 --- a/ipsilon/info/common.py +++ b/ipsilon/info/common.py @@ -5,14 +5,15 @@ # See the file named COPYING for the project license from ipsilon.util.log import Log -from ipsilon.util.plugin import PluginLoader, PluginObject -from ipsilon.util.plugin import PluginInstaller +from ipsilon.util.plugin import PluginInstaller, PluginLoader +from ipsilon.util.plugin import PluginObject, PluginConfig -class InfoProviderBase(PluginObject, Log): +class InfoProviderBase(PluginConfig, PluginObject): def __init__(self): - super(InfoProviderBase, self).__init__() + PluginConfig.__init__(self) + PluginObject.__init__(self) self._site = None self.is_enabled = False @@ -29,7 +30,7 @@ class InfoProviderBase(PluginObject, Log): # configure self if self.name in plugins['config']: - self.set_config(plugins['config'][self.name]) + self.import_config(plugins['config'][self.name]) plugins['enabled'].append(self) self.is_enabled = True