summaryrefslogtreecommitdiffstats
path: root/module/PluginManager.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2010-09-14 12:53:55 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2010-09-14 12:53:55 +0200
commite2d85f9ab8a4a0ea322ffd74b3d2cf756b4d943c (patch)
treef9503e548410bb9e87f4aa2bca39d3cc64f3b7ad /module/PluginManager.py
parentbetter plugin config parsing (diff)
downloadpyload-e2d85f9ab8a4a0ea322ffd74b3d2cf756b4d943c.tar.xz
reverted, closed #129
Diffstat (limited to 'module/PluginManager.py')
-rw-r--r--module/PluginManager.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/module/PluginManager.py b/module/PluginManager.py
index fe4a94dac..29c01ce21 100644
--- a/module/PluginManager.py
+++ b/module/PluginManager.py
@@ -30,7 +30,6 @@ from os.path import abspath
from sys import version_info
from itertools import chain
-from ast import literal_eval
class PluginManager():
@@ -166,11 +165,7 @@ class PluginManager():
config = self.reConfig.findall(content)
if config:
- 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)]
+ config = [ [y.strip() for y in x.replace("'","").replace('"',"").replace(")","").split(",")] for x in config[0].split("(") if x.strip()]
if folder == "hooks":
config.append( ["load", "bool", "Load on startup", True if name not in ("XMPPInterface", "MultiHome") else False] )