summaryrefslogtreecommitdiffstats
path: root/pyload/manager/PluginManager.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-11-15 17:15:29 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-11-15 17:15:29 +0100
commit282362c01b67f83ff5cf677ba125a41a6d594f2c (patch)
tree7782f1a146f41fa26fdd2c4bdb1679977cf5cf35 /pyload/manager/PluginManager.py
parentCode cosmetics (diff)
downloadpyload-282362c01b67f83ff5cf677ba125a41a6d594f2c.tar.xz
Update plugins 2
Diffstat (limited to 'pyload/manager/PluginManager.py')
-rw-r--r--pyload/manager/PluginManager.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/pyload/manager/PluginManager.py b/pyload/manager/PluginManager.py
index f91279d77..8f837587a 100644
--- a/pyload/manager/PluginManager.py
+++ b/pyload/manager/PluginManager.py
@@ -187,8 +187,9 @@ class PluginManager:
res.append((url, last[0]))
continue
- for name, value in chain(self.crypterPlugins.iteritems(), self.hosterPlugins.iteritems(),
- self.containerPlugins.iteritems()):
+ for name, value in (self.crypterPlugins.iteritems(),
+ self.hosterPlugins.iteritems(),
+ self.containerPlugins.iteritems()):
try:
m = value['re'].match(url)
except KeyError:
@@ -220,7 +221,7 @@ class PluginManager:
if not plugin:
self.core.log.warning("Plugin %s not found" % name)
- plugin = self.hosterPlugins['BasePlugin']
+ plugin = self.internalPlugins['BasePlugin']
if "new_module" in plugin and not original:
return plugin['new_module']