summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-11-11 11:51:58 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-11-11 11:51:58 +0100
commit8eb504f8db6aefa97c92f25ced59bf434367a76a (patch)
treebba8c67592939590bd4f77a685525095b0984d5c /module/plugins
parentFix url to name conversion in api and simple plugins (diff)
downloadpyload-8eb504f8db6aefa97c92f25ced59bf434367a76a.tar.xz
[PluginManager] Fix self.plugins ref (thx clinton-hall)
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/PluginManager.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/module/plugins/PluginManager.py b/module/plugins/PluginManager.py
index 59fdb31e8..a18a53bdb 100644
--- a/module/plugins/PluginManager.py
+++ b/module/plugins/PluginManager.py
@@ -44,7 +44,10 @@ class PluginManager:
sys.path.append(abspath(""))
- for type in ('accounts', 'captcha', 'container', 'crypter', 'hooks', 'hoster', 'internal')
+ #@NOTE: In 0.4.10 directory "accounts" changes to "account"
+ self.plugins['accounts'] = self.accountPlugins = self.parse("accounts")
+
+ for type in ('captcha', 'container', 'crypter', 'hooks', 'hoster', 'internal'):
self.plugins[type] = self.parse(type)
setattr(self, "%sPlugins" % type, self.plugins[type])
@@ -351,7 +354,11 @@ class PluginManager:
#index creation
self.plugins[type] = self.parse(type)
- setattr(self, "%sPlugins" % type, self.plugins[type])
+
+ if type is "accounts":
+ self.accountPlugins = self.plugins[type] #@TODO: Remove in 0.4.10
+ else:
+ setattr(self, "%sPlugins" % type, self.plugins[type])
if "accounts" in as_dict: #: accounts needs to be reloaded
self.core.accountManager.initPlugins()