From fcead1870013b6a970eca7878a66dbe783c80ea3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 16 Feb 2015 03:40:45 +0100 Subject: Partially revert acc46fc3497a66a427b795b4a22c6e71d69185a1 --- pyload/manager/Addon.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pyload/manager/Addon.py') diff --git a/pyload/manager/Addon.py b/pyload/manager/Addon.py index 164068634..d293109c7 100644 --- a/pyload/manager/Addon.py +++ b/pyload/manager/Addon.py @@ -105,7 +105,7 @@ class AddonManager(object): for pluginname in self.core.pluginManager.addonPlugins: try: - # hookClass = getattr(plugin, plugin.__name) + # hookClass = getattr(plugin, plugin.__name__) if self.core.config.getPlugin(pluginname, "activated"): pluginClass = self.core.pluginManager.loadClass("addon", pluginname) if not pluginClass: @@ -113,9 +113,9 @@ class AddonManager(object): plugin = pluginClass(self.core, self) plugins.append(plugin) - self.pluginMap[pluginClass.__name] = plugin + self.pluginMap[pluginClass.__name__] = plugin if plugin.isActivated(): - active.append(pluginClass.__name) + active.append(pluginClass.__name__) else: deactive.append(pluginname) @@ -141,7 +141,7 @@ class AddonManager(object): def activateAddon(self, pluginname): # check if already loaded for inst in self.plugins: - if inst.__name == pluginname: + if inst.__name__ == pluginname: return pluginClass = self.core.pluginManager.loadClass("addon", pluginname) @@ -153,14 +153,14 @@ class AddonManager(object): addon = pluginClass(self.core, self) self.plugins.append(addon) - self.pluginMap[pluginClass.__name] = addon + self.pluginMap[pluginClass.__name__] = addon addon.activate() def deactivateAddon(self, pluginname): for plugin in self.plugins: - if plugin.__name == pluginname: + if plugin.__name__ == pluginname: addon = plugin break else: @@ -174,7 +174,7 @@ class AddonManager(object): self.core.log.debug("Removed callback: %s" % self.core.scheduler.removeJob(addon.cb)) self.plugins.remove(addon) - del self.pluginMap[addon.__name] + del self.pluginMap[addon.__name__] @try_catch -- cgit v1.2.3