summaryrefslogtreecommitdiffstats
path: root/module/PluginManager.py
diff options
context:
space:
mode:
authorGravatar mkaay <mkaay@mkaay.de> 2010-09-14 18:13:37 +0200
committerGravatar mkaay <mkaay@mkaay.de> 2010-09-14 18:13:37 +0200
commit46d16791cc4f3acd4424667146fcd85ae542f08d (patch)
tree2fd0d43a721d5853f6721560bcc278b7c2894267 /module/PluginManager.py
parentresolved a python 2.5 issue (diff)
downloadpyload-46d16791cc4f3acd4424667146fcd85ae542f08d.tar.xz
missing file, again..
Diffstat (limited to 'module/PluginManager.py')
-rw-r--r--module/PluginManager.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/module/PluginManager.py b/module/PluginManager.py
index 19dd5886f..85504ed24 100644
--- a/module/PluginManager.py
+++ b/module/PluginManager.py
@@ -169,7 +169,11 @@ class PluginManager():
config = self.reConfig.findall(content)
if config:
- config = [ [y.strip() for y in x.replace("'","").replace('"',"").replace(")","").split(",")] for x in config[0].split("(") if x.strip()]
+ config = literal_eval(config[0].strip().replace("\n", "").replace("\r", ""))
+ if type(config[0]) == tuple:
+ config = [list(x) for x in config]
+ else:
+ config = [list(config)]
if folder == "hooks":
config.append( ["load", "bool", "Load on startup", True if name not in ("XMPPInterface", "MultiHome") else False] )