summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar mkaay <mkaay@mkaay.de> 2010-09-14 20:36:29 +0200
committerGravatar mkaay <mkaay@mkaay.de> 2010-09-14 20:36:29 +0200
commitc811b78e4c4a1a112542ed10e2a713a3cd110128 (patch)
tree54c2141bececd22f3ac28d1df8858618e4889ba2
parentextended parser (diff)
downloadpyload-c811b78e4c4a1a112542ed10e2a713a3cd110128.tar.xz
extended safe_eval
-rw-r--r--module/SafeEval.py4
-rw-r--r--module/plugins/hoster/RapidshareCom.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/module/SafeEval.py b/module/SafeEval.py
index bf2576502..8ec9766e6 100644
--- a/module/SafeEval.py
+++ b/module/SafeEval.py
@@ -44,7 +44,9 @@ class SafeEvalWithErrors(SafeEval):
node.__class__,node)
def visitName(self,node, **kw):
- if node.name == "True":
+ if node.name == "None":
+ return None
+ elif node.name == "True":
return True
elif node.name == "False":
return False
diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py
index cf8bc9069..3d40ba9d5 100644
--- a/module/plugins/hoster/RapidshareCom.py
+++ b/module/plugins/hoster/RapidshareCom.py
@@ -40,7 +40,7 @@ class RapidshareCom(Hoster):
__pattern__ = r"http://[\w\.]*?rapidshare.com/files/(\d*?)/(.*)"
__version__ = "1.1"
__description__ = """Rapidshare.com Download Hoster"""
- __config__ = [ ("server", "str", "Preferred Server", "None") ]
+ __config__ = [["server", "Cogent;Deutsche Telekom;Level(3);Level(3) #2;GlobalCrossing;Level(3) #3;Teleglobe;GlobalCrossing #2;TeliaSonera #2;Teleglobe #2;TeliaSonera #3;TeliaSonera", "Preferred Server", "None"]]
__author_name__ = ("spoob", "RaNaN", "mkaay")
__author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "mkaay@mkaay.de")