From 088e0e38fd7419951d31bbc389c95d1c662e550f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 11 Apr 2014 12:15:32 +0200 Subject: Fix __config__ Merges vuolter/pyload@83ff313 (cherry picked from commit d27113cef108461e2363cc4c88c4a1d01222c9e9) Conflicts: module/plugins/Hook.py module/plugins/hooks/MultiDebridCom.py module/plugins/hooks/UnrestrictLi.py --- pyload/plugins/hoster/RapidshareCom.py | 4 ++-- pyload/plugins/hoster/VeehdCom.py | 6 ++---- pyload/plugins/hoster/XVideosCom.py | 4 +++- pyload/plugins/hoster/Xdcc.py | 8 +++----- pyload/plugins/hoster/ZDF.py | 4 +++- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'pyload/plugins/hoster') diff --git a/pyload/plugins/hoster/RapidshareCom.py b/pyload/plugins/hoster/RapidshareCom.py index c0276279e..e9735832b 100644 --- a/pyload/plugins/hoster/RapidshareCom.py +++ b/pyload/plugins/hoster/RapidshareCom.py @@ -55,9 +55,9 @@ class RapidshareCom(Hoster): __pattern__ = r"https?://[\w\.]*?rapidshare.com/(?:files/(?P\d*?)/(?P[^?]+)|#!download\|(?:\w+)\|(?P\d+)\|(?P[^|]+))" __version__ = "1.39" __description__ = """Rapidshare.com hoster plugin""" - __config__ = [["server", + __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"]] + "Preferred Server", "None")] __author_name__ = ("spoob", "RaNaN", "mkaay") __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "mkaay@mkaay.de") diff --git a/pyload/plugins/hoster/VeehdCom.py b/pyload/plugins/hoster/VeehdCom.py index 8a4433fa4..b3523491a 100644 --- a/pyload/plugins/hoster/VeehdCom.py +++ b/pyload/plugins/hoster/VeehdCom.py @@ -8,10 +8,8 @@ class VeehdCom(Hoster): __name__ = 'VeehdCom' __type__ = 'hoster' __pattern__ = r'http://veehd\.com/video/\d+_\S+' - __config__ = [ - ('filename_spaces', 'bool', "Allow spaces in filename", 'False'), - ('replacement_char', 'str', "Filename replacement character", '_'), - ] + __config__ = [("filename_spaces", "bool", "Allow spaces in filename", False), + ("replacement_char", "str", "Filename replacement character", "_")] __version__ = '0.23' __description__ = """Veehd.com hoster plugin""" __author_name__ = "cat" diff --git a/pyload/plugins/hoster/XVideosCom.py b/pyload/plugins/hoster/XVideosCom.py index 48a1f934d..902f627a8 100644 --- a/pyload/plugins/hoster/XVideosCom.py +++ b/pyload/plugins/hoster/XVideosCom.py @@ -8,7 +8,9 @@ class XVideosCom(Hoster): __name__ = "XVideos.com" __version__ = "0.1" __pattern__ = r"http://www\.xvideos\.com/video([0-9]+)/.*" - __config__ = [] + __description__ = """XVideos.com hoster plugin""" + __author_name__ = "" + __author_mail__ = "" def process(self, pyfile): site = self.load(pyfile.url) diff --git a/pyload/plugins/hoster/Xdcc.py b/pyload/plugins/hoster/Xdcc.py index e1c423453..43f0dd656 100644 --- a/pyload/plugins/hoster/Xdcc.py +++ b/pyload/plugins/hoster/Xdcc.py @@ -36,11 +36,9 @@ class Xdcc(Hoster): __version__ = "0.32" __pattern__ = r'xdcc://.*?(/#?.*?)?/.*?/#?\d+/?' # xdcc://irc.Abjects.net/#channel/[XDCC]|Shit/#0004/ __type__ = "hoster" - __config__ = [ - ("nick", "str", "Nickname", "pyload"), - ("ident", "str", "Ident", "pyloadident"), - ("realname", "str", "Realname", "pyloadreal") - ] + __config__ = [("nick", "str", "Nickname", "pyload"), + ("ident", "str", "Ident", "pyloadident"), + ("realname", "str", "Realname", "pyloadreal")] __description__ = """Download from IRC XDCC bot""" __author_name__ = "jeix" __author_mail__ = "jeix@hasnomail.com" diff --git a/pyload/plugins/hoster/ZDF.py b/pyload/plugins/hoster/ZDF.py index e45717186..18aa80a00 100644 --- a/pyload/plugins/hoster/ZDF.py +++ b/pyload/plugins/hoster/ZDF.py @@ -12,7 +12,9 @@ class ZDF(Hoster): __name__ = "ZDF Mediathek" __version__ = "0.8" __pattern__ = r"http://www\.zdf\.de/ZDFmediathek/[^0-9]*([0-9]+)[^0-9]*" - __config__ = [] + __description__ = """ZDF.de hoster plugin""" + __author_name__ = "" + __author_mail__ = "" @staticmethod def video_key(video): -- cgit v1.2.3