Merge branch 'master' into autoadd

Conflicts:
	deluge/plugins/pluginbase.py
This commit is contained in:
Chase Sterling 2010-03-26 11:16:03 -04:00
commit 1a26287a5a
1 changed files with 5 additions and 3 deletions

View File

@ -37,9 +37,11 @@ import deluge.component as component
from deluge.log import LOG as log from deluge.log import LOG as log
class PluginBase(component.Component): class PluginBase(component.Component):
update_interval = 1
def __init__(self, name): def __init__(self, name):
interval = self.update_interval if hasattr(self, 'update_interval') else 1 super(PluginBase, self).__init__(name, self.update_interval)
super(PluginBase, self).__init__(name, interval)
def enable(self): def enable(self):
raise NotImplementedError("Need to define an enable method!") raise NotImplementedError("Need to define an enable method!")
@ -49,7 +51,7 @@ class PluginBase(component.Component):
class CorePluginBase(PluginBase): class CorePluginBase(PluginBase):
def __init__(self, plugin_name): def __init__(self, plugin_name):
super(PluginBase, self).__init__("CorePlugin." + plugin_name) super(CorePluginBase, self).__init__("CorePlugin." + plugin_name)
# Register RPC methods # Register RPC methods
component.get("RPCServer").register_object(self, plugin_name.lower()) component.get("RPCServer").register_object(self, plugin_name.lower())
log.debug("CorePlugin initialized..") log.debug("CorePlugin initialized..")