Fix plugins key attributes

27 files changed, 294 insertions, 294 deletions

diff --git a/pyload/plugins/hook/AlldebridCom.py b/pyload/plugins/hook/AlldebridCom.py
index cf79af917..a5312345b 100644
--- a/pyload/plugins/hook/AlldebridCom.py
+++ b/pyload/plugins/hook/AlldebridCom.py
@@ -5,19 +5,19 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class AlldebridCom(MultiHoster):
-    __name__    = "AlldebridCom"
-    __type__    = "hook"
-    __version__ = "0.13"
-
-    __config__ = [("https", "bool", "Enable HTTPS", False),
-                  ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
-
-    __description__ = """Alldebrid.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Andy Voigt", "spamsales@online.de")]
+    __name    = "AlldebridCom"
+    __type    = "hook"
+    __version = "0.13"
+
+    __config = [("https", "bool", "Enable HTTPS", False),
+                ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", ""),
+                ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
+                ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
+
+    __description = """Alldebrid.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Andy Voigt", "spamsales@online.de")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/BypassCaptcha.py b/pyload/plugins/hook/BypassCaptcha.py
index 610cfac64..e5c455276 100644
--- a/pyload/plugins/hook/BypassCaptcha.py
+++ b/pyload/plugins/hook/BypassCaptcha.py
@@ -26,16 +26,16 @@ class BypassCaptchaException(Exception):
 
 
 class BypassCaptcha(Addon):
-    __name__    = "BypassCaptcha"
-    __type__    = "hook"
-    __version__ = "0.05"
+    __name    = "BypassCaptcha"
+    __type    = "hook"
+    __version = "0.05"
 
-    __config__ = [("force", "bool", "Force BC even if client is connected", False),
-                  ("passkey", "password", "Passkey", "")]
+    __config = [("force", "bool", "Force BC even if client is connected", False),
+                ("passkey", "password", "Passkey", "")]
 
-    __description__ = """Send captchas to BypassCaptcha.com"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """Send captchas to BypassCaptcha.com"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("Godofdream", "soilfcition@gmail.com"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
@@ -104,20 +104,20 @@ class BypassCaptcha(Addon):
 
         if self.getCredits() > 0:
             task.handler.append(self)
-            task.data['service'] = self.__name__
+            task.data['service'] = self.__name
             task.setWaiting(100)
             self.processCaptcha(task)
         else:
-            self.logInfo(_("Your %s account has not enough credits") % self.__name__)
+            self.logInfo(_("Your %s account has not enough credits") % self.__name)
 
 
     def captchaCorrect(self, task):
-        if task.data['service'] == self.__name__ and "ticket" in task.data:
+        if task.data['service'] == self.__name and "ticket" in task.data:
             self.respond(task.data['ticket'], True)
 
 
     def captchaInvalid(self, task):
-        if task.data['service'] == self.__name__ and "ticket" in task.data:
+        if task.data['service'] == self.__name and "ticket" in task.data:
             self.respond(task.data['ticket'], False)
 
 
diff --git a/pyload/plugins/hook/Captcha9kw.py b/pyload/plugins/hook/Captcha9kw.py
index f3f086adf..5d04a6481 100644
--- a/pyload/plugins/hook/Captcha9kw.py
+++ b/pyload/plugins/hook/Captcha9kw.py
@@ -14,25 +14,25 @@ from pyload.plugins.Addon import Addon
 
 
 class Captcha9kw(Addon):
-    __name__    = "Captcha9kw"
-    __type__    = "hook"
-    __version__ = "0.26"
-
-    __config__ = [("ssl"           , "bool"    , "Use HTTPS"                                                                       , True                                                               ),
-                  ("force"         , "bool"    , "Force captcha resolving even if client is connected"                             , True                                                               ),
-                  ("confirm"       , "bool"    , "Confirm Captcha (cost +6 credits)"                                               , False                                                              ),
-                  ("captchaperhour", "int"     , "Captcha per hour"                                                                , "9999"                                                             ),
-                  ("captchapermin" , "int"     , "Captcha per minute"                                                              , "9999"                                                             ),
-                  ("prio"          , "int"     , "Priority (max 10)(cost +0 -> +10 credits)"                                       , "0"                                                                ),
-                  ("queue"         , "int"     , "Max. Queue (max 999)"                                                            , "50"                                                               ),
-                  ("hoster_options", "string"  , "Hoster options (format: pluginname:prio=1:selfsolfe=1:confirm=1:timeout=900|...)", "ShareonlineBiz:prio=0:timeout=999 | UploadedTo:prio=0:timeout=999"),
-                  ("selfsolve"     , "bool"    , "Selfsolve (manually solve your captcha in your 9kw client if active)"            , "0"                                                                ),
-                  ("passkey"       , "password", "API key"                                                                         , ""                                                                 ),
-                  ("timeout"       , "int"     , "Timeout in seconds (min 60, max 3999)"                                           , "900"                                                              )]
-
-    __description__ = """Send captchas to 9kw.eu"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __name    = "Captcha9kw"
+    __type    = "hook"
+    __version = "0.26"
+
+    __config = [("ssl"           , "bool"    , "Use HTTPS"                                                                       , True                                                               ),
+                ("force"         , "bool"    , "Force captcha resolving even if client is connected"                             , True                                                               ),
+                ("confirm"       , "bool"    , "Confirm Captcha (cost +6 credits)"                                               , False                                                              ),
+                ("captchaperhour", "int"     , "Captcha per hour"                                                                , "9999"                                                             ),
+                ("captchapermin" , "int"     , "Captcha per minute"                                                              , "9999"                                                             ),
+                ("prio"          , "int"     , "Priority (max 10)(cost +0 -> +10 credits)"                                       , "0"                                                                ),
+                ("queue"         , "int"     , "Max. Queue (max 999)"                                                            , "50"                                                               ),
+                ("hoster_options", "string"  , "Hoster options (format: pluginname:prio=1:selfsolfe=1:confirm=1:timeout=900|...)", "ShareonlineBiz:prio=0:timeout=999 | UploadedTo:prio=0:timeout=999"),
+                ("selfsolve"     , "bool"    , "Selfsolve (manually solve your captcha in your 9kw client if active)"            , "0"                                                                ),
+                ("passkey"       , "password", "API key"                                                                         , ""                                                                 ),
+                ("timeout"       , "int"     , "Timeout in seconds (min 60, max 3999)"                                           , "900"                                                              )]
+
+    __description = """Send captchas to 9kw.eu"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugins/hook/CaptchaBrotherhood.py b/pyload/plugins/hook/CaptchaBrotherhood.py
index 333c0be85..b5e5f34ca 100644
--- a/pyload/plugins/hook/CaptchaBrotherhood.py
+++ b/pyload/plugins/hook/CaptchaBrotherhood.py
@@ -36,17 +36,17 @@ class CaptchaBrotherhoodException(Exception):
 
 
 class CaptchaBrotherhood(Addon):
-    __name__    = "CaptchaBrotherhood"
-    __type__    = "hook"
-    __version__ = "0.06"
+    __name    = "CaptchaBrotherhood"
+    __type    = "hook"
+    __version = "0.06"
 
-    __config__ = [("username", "str", "Username", ""),
-                  ("force", "bool", "Force CT even if client is connected", False),
-                  ("passkey", "password", "Password", "")]
+    __config = [("username", "str", "Username", ""),
+                ("force", "bool", "Force CT even if client is connected", False),
+                ("passkey", "password", "Password", "")]
 
-    __description__ = """Send captchas to CaptchaBrotherhood.com"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """Send captchas to CaptchaBrotherhood.com"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
@@ -142,7 +142,7 @@ class CaptchaBrotherhood(Addon):
 
         if self.getCredits() > 10:
             task.handler.append(self)
-            task.data['service'] = self.__name__
+            task.data['service'] = self.__name
             task.setWaiting(100)
             self.processCaptcha(task)
         else:
@@ -150,7 +150,7 @@ class CaptchaBrotherhood(Addon):
 
 
     def captchaInvalid(self, task):
-        if task.data['service'] == self.__name__ and "ticket" in task.data:
+        if task.data['service'] == self.__name and "ticket" in task.data:
             res = self.get_api("complainCaptcha", task.data['ticket'])
 
 
diff --git a/pyload/plugins/hook/DeathByCaptcha.py b/pyload/plugins/hook/DeathByCaptcha.py
index f2ccb383b..240f9a5ce 100644
--- a/pyload/plugins/hook/DeathByCaptcha.py
+++ b/pyload/plugins/hook/DeathByCaptcha.py
@@ -49,17 +49,17 @@ class DeathByCaptchaException(Exception):
 
 
 class DeathByCaptcha(Addon):
-    __name__    = "DeathByCaptcha"
-    __type__    = "hook"
-    __version__ = "0.04"
+    __name    = "DeathByCaptcha"
+    __type    = "hook"
+    __version = "0.04"
 
-    __config__ = [("username", "str", "Username", ""),
-                  ("passkey", "password", "Password", ""),
-                  ("force", "bool", "Force DBC even if client is connected", False)]
+    __config = [("username", "str", "Username", ""),
+                ("passkey", "password", "Password", ""),
+                ("force", "bool", "Force DBC even if client is connected", False)]
 
-    __description__ = """Send captchas to DeathByCaptcha.com"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """Send captchas to DeathByCaptcha.com"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
@@ -183,13 +183,13 @@ class DeathByCaptcha(Addon):
 
         if balance > rate:
             task.handler.append(self)
-            task.data['service'] = self.__name__
+            task.data['service'] = self.__name
             task.setWaiting(180)
             self.processCaptcha(task)
 
 
     def captchaInvalid(self, task):
-        if task.data['service'] == self.__name__ and "ticket" in task.data:
+        if task.data['service'] == self.__name and "ticket" in task.data:
             try:
                 res = self.call_api("captcha/%d/report" % task.data['ticket'], True)
 
diff --git a/pyload/plugins/hook/DebridItaliaCom.py b/pyload/plugins/hook/DebridItaliaCom.py
index 01e085ad2..ee00fc375 100644
--- a/pyload/plugins/hook/DebridItaliaCom.py
+++ b/pyload/plugins/hook/DebridItaliaCom.py
@@ -7,18 +7,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class DebridItaliaCom(MultiHoster):
-    __name__    = "DebridItaliaCom"
-    __type__    = "hook"
-    __version__ = "0.08"
-
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to standard download if download fails", False),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
-
-    __description__ = """Debriditalia.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it"),
+    __name    = "DebridItaliaCom"
+    __type    = "hook"
+    __version = "0.08"
+
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", ""),
+                ("unloadFailing", "bool", "Revert to standard download if download fails", False),
+                ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
+
+    __description = """Debriditalia.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugins/hook/EasybytezCom.py b/pyload/plugins/hook/EasybytezCom.py
index 9d92b96f7..e24c82a9f 100644
--- a/pyload/plugins/hook/EasybytezCom.py
+++ b/pyload/plugins/hook/EasybytezCom.py
@@ -6,20 +6,20 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class EasybytezCom(MultiHoster):
-    __name__    = "EasybytezCom"
-    __type__    = "hook"
-    __version__ = "0.03"
+    __name    = "EasybytezCom"
+    __type    = "hook"
+    __version = "0.03"
 
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", "")]
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", "")]
 
-    __description__ = """EasyBytez.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """EasyBytez.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def getHoster(self):
-        self.account = self.core.accountManager.getAccountPlugin(self.__name__)
+        self.account = self.core.accountManager.getAccountPlugin(self.__name)
         user = self.account.selectAccount()[0]
 
         try:
diff --git a/pyload/plugins/hook/ExpertDecoders.py b/pyload/plugins/hook/ExpertDecoders.py
index a9b9bdf2c..d4d125b2a 100644
--- a/pyload/plugins/hook/ExpertDecoders.py
+++ b/pyload/plugins/hook/ExpertDecoders.py
@@ -12,16 +12,16 @@ from pyload.plugins.Addon import Addon
 
 
 class ExpertDecoders(Addon):
-    __name__    = "ExpertDecoders"
-    __type__    = "hook"
-    __version__ = "0.02"
+    __name    = "ExpertDecoders"
+    __type    = "hook"
+    __version = "0.02"
 
-    __config__ = [("force", "bool", "Force CT even if client is connected", False),
-                  ("passkey", "password", "Access key", "")]
+    __config = [("force", "bool", "Force CT even if client is connected", False),
+                ("passkey", "password", "Access key", "")]
 
-    __description__ = """Send captchas to expertdecoders.com"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """Send captchas to expertdecoders.com"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/pyload/plugins/hook/FastixRu.py b/pyload/plugins/hook/FastixRu.py
index 0ae853544..bd3994243 100644
--- a/pyload/plugins/hook/FastixRu.py
+++ b/pyload/plugins/hook/FastixRu.py
@@ -6,17 +6,17 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class FastixRu(MultiHoster):
-    __name__    = "FastixRu"
-    __type__    = "hook"
-    __version__ = "0.02"
+    __name    = "FastixRu"
+    __type    = "hook"
+    __version = "0.02"
 
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("unloadFailing", "bool", "Revert to standard download if download fails", False),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                ("unloadFailing", "bool", "Revert to standard download if download fails", False),
+                ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """Fastix.ru hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")]
+    __description = """Fastix.ru hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Massimo Rosamilia", "max@spiritix.eu")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/FreeWayMe.py b/pyload/plugins/hook/FreeWayMe.py
index 5d955e156..27297f77a 100644
--- a/pyload/plugins/hook/FreeWayMe.py
+++ b/pyload/plugins/hook/FreeWayMe.py
@@ -5,18 +5,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class FreeWayMe(MultiHoster):
-    __name__    = "FreeWayMe"
-    __type__    = "hook"
-    __version__ = "0.11"
+    __name    = "FreeWayMe"
+    __type    = "hook"
+    __version = "0.11"
 
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", ""),
+                ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
+                ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """FreeWay.me hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Nicolas Giese", "james@free-way.me")]
+    __description = """FreeWay.me hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Nicolas Giese", "james@free-way.me")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/ImageTyperz.py b/pyload/plugins/hook/ImageTyperz.py
index 2432dce7d..9a9fc0eef 100644
--- a/pyload/plugins/hook/ImageTyperz.py
+++ b/pyload/plugins/hook/ImageTyperz.py
@@ -30,17 +30,17 @@ class ImageTyperzException(Exception):
 
 
 class ImageTyperz(Addon):
-    __name__    = "ImageTyperz"
-    __type__    = "hook"
-    __version__ = "0.05"
+    __name    = "ImageTyperz"
+    __type    = "hook"
+    __version = "0.05"
 
-    __config__ = [("username", "str", "Username", ""),
-                  ("passkey", "password", "Password", ""),
-                  ("force", "bool", "Force IT even if client is connected", False)]
+    __config = [("username", "str", "Username", ""),
+                ("passkey", "password", "Password", ""),
+                ("force", "bool", "Force IT even if client is connected", False)]
 
-    __description__ = """Send captchas to ImageTyperz.com"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """Send captchas to ImageTyperz.com"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
@@ -118,15 +118,15 @@ class ImageTyperz(Addon):
 
         if self.getCredits() > 0:
             task.handler.append(self)
-            task.data['service'] = self.__name__
+            task.data['service'] = self.__name
             task.setWaiting(100)
             self.processCaptcha(task)
         else:
-            self.logInfo(_("Your %s account has not enough credits") % self.__name__)
+            self.logInfo(_("Your %s account has not enough credits") % self.__name)
 
 
     def captchaInvalid(self, task):
-        if task.data['service'] == self.__name__ and "ticket" in task.data:
+        if task.data['service'] == self.__name and "ticket" in task.data:
             res = getURL(self.RESPOND_URL,
                          post={'action': "SETBADIMAGE",
                                'username': self.getConfig("username"),
diff --git a/pyload/plugins/hook/LinkdecrypterCom.py b/pyload/plugins/hook/LinkdecrypterCom.py
index 0e8ec7554..41aa434d4 100644
--- a/pyload/plugins/hook/LinkdecrypterCom.py
+++ b/pyload/plugins/hook/LinkdecrypterCom.py
@@ -8,13 +8,13 @@ from pyload.utils import remove_chars
 
 
 class LinkdecrypterCom(Addon):
-    __name__    = "LinkdecrypterCom"
-    __type__    = "hook"
-    __version__ = "0.21"
+    __name    = "LinkdecrypterCom"
+    __type    = "hook"
+    __version = "0.21"
 
-    __description__ = """Linkdecrypter.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Linkdecrypter.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def coreReady(self):
@@ -53,7 +53,7 @@ class LinkdecrypterCom(Addon):
 
         regexp = r'https?://([^.]+\.)*?(%s)/.*' % '|'.join(online)
 
-        dict = self.core.pluginManager.crypterPlugins[self.__name__]
+        dict = self.core.pluginManager.crypterPlugins[self.__name]
         dict['pattern'] = regexp
         dict['re'] = re.compile(regexp)
 
diff --git a/pyload/plugins/hook/LinksnappyCom.py b/pyload/plugins/hook/LinksnappyCom.py
index 381eb6a2a..d34188987 100644
--- a/pyload/plugins/hook/LinksnappyCom.py
+++ b/pyload/plugins/hook/LinksnappyCom.py
@@ -6,18 +6,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class LinksnappyCom(MultiHoster):
-    __name__    = "LinksnappyCom"
-    __type__    = "hook"
-    __version__ = "0.01"
-
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to standard download if download fails", False),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
-
-    __description__ = """Linksnappy.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __name    = "LinksnappyCom"
+    __type    = "hook"
+    __version = "0.01"
+
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", ""),
+                ("unloadFailing", "bool", "Revert to standard download if download fails", False),
+                ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
+
+    __description = """Linksnappy.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/MegaDebridEu.py b/pyload/plugins/hook/MegaDebridEu.py
index 5a52dbf41..4fff41a51 100644
--- a/pyload/plugins/hook/MegaDebridEu.py
+++ b/pyload/plugins/hook/MegaDebridEu.py
@@ -6,15 +6,15 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class MegaDebridEu(MultiHoster):
-    __name__    = "MegaDebridEu"
-    __type__    = "hook"
-    __version__ = "0.02"
+    __name    = "MegaDebridEu"
+    __type    = "hook"
+    __version = "0.02"
 
-    __config__ = [("unloadFailing", "bool", "Revert to standard download if download fails", False)]
+    __config = [("unloadFailing", "bool", "Revert to standard download if download fails", False)]
 
-    __description__ = """mega-debrid.eu hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("D.Ducatel", "dducatel@je-geek.fr")]
+    __description = """mega-debrid.eu hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("D.Ducatel", "dducatel@je-geek.fr")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/MultishareCz.py b/pyload/plugins/hook/MultishareCz.py
index f1a12acb8..13906734f 100644
--- a/pyload/plugins/hook/MultishareCz.py
+++ b/pyload/plugins/hook/MultishareCz.py
@@ -7,16 +7,16 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class MultishareCz(MultiHoster):
-    __name__    = "MultishareCz"
-    __type__    = "hook"
-    __version__ = "0.04"
+    __name    = "MultishareCz"
+    __type    = "hook"
+    __version = "0.04"
 
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", "uloz.to")]
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", "uloz.to")]
 
-    __description__ = """MultiShare.cz hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """MultiShare.cz hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_PATTERN = r'<img class="logo-shareserveru"[^>]*?alt="([^"]+)"></td>\s*<td class="stav">[^>]*?alt="OK"'
diff --git a/pyload/plugins/hook/MyfastfileCom.py b/pyload/plugins/hook/MyfastfileCom.py
index 07988d2b9..bf07992f5 100644
--- a/pyload/plugins/hook/MyfastfileCom.py
+++ b/pyload/plugins/hook/MyfastfileCom.py
@@ -6,19 +6,19 @@ from pyload.utils import json_loads
 
 
 class MyfastfileCom(MultiHoster):
-    __name__    = "MyfastfileCom"
-    __type__    = "hook"
-    __version__ = "0.02"
+    __name    = "MyfastfileCom"
+    __type    = "hook"
+    __version = "0.02"
 
 
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to standard download if download fails", False),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", ""),
+                ("unloadFailing", "bool", "Revert to standard download if download fails", False),
+                ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """Myfastfile.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Myfastfile.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
 
diff --git a/pyload/plugins/hook/OverLoadMe.py b/pyload/plugins/hook/OverLoadMe.py
index 83ce3e842..caa9ef14c 100644
--- a/pyload/plugins/hook/OverLoadMe.py
+++ b/pyload/plugins/hook/OverLoadMe.py
@@ -5,19 +5,19 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class OverLoadMe(MultiHoster):
-    __name__    = "OverLoadMe"
-    __type__    = "hook"
-    __version__ = "0.01"
-
-    __config__ = [("https", "bool", "Enable HTTPS", True),
-                  ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to standard download if download fails", False),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", 12)]
-
-    __description__ = """Over-Load.me hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("marley", "marley@over-load.me")]
+    __name    = "OverLoadMe"
+    __type    = "hook"
+    __version = "0.01"
+
+    __config = [("https", "bool", "Enable HTTPS", True),
+                ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", ""),
+                ("unloadFailing", "bool", "Revert to standard download if download fails", False),
+                ("interval", "int", "Reload interval in hours (0 to disable)", 12)]
+
+    __description = """Over-Load.me hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("marley", "marley@over-load.me")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/PremiumTo.py b/pyload/plugins/hook/PremiumTo.py
index e3c9823f6..31858f8dd 100644
--- a/pyload/plugins/hook/PremiumTo.py
+++ b/pyload/plugins/hook/PremiumTo.py
@@ -5,16 +5,16 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class PremiumTo(MultiHoster):
-    __name__    = "PremiumTo"
-    __type__    = "hook"
-    __version__ = "0.04"
+    __name    = "PremiumTo"
+    __type    = "hook"
+    __version = "0.04"
 
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for downloads from supported hosters:", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", "")]
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for downloads from supported hosters:", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", "")]
 
-    __description__ = """Premium.to hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """Premium.to hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
diff --git a/pyload/plugins/hook/PremiumizeMe.py b/pyload/plugins/hook/PremiumizeMe.py
index 5824115b6..34f46f6ca 100644
--- a/pyload/plugins/hook/PremiumizeMe.py
+++ b/pyload/plugins/hook/PremiumizeMe.py
@@ -6,18 +6,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class PremiumizeMe(MultiHoster):
-    __name__    = "PremiumizeMe"
-    __type__    = "hook"
-    __version__ = "0.12"
-
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
-
-    __description__ = """Premiumize.me hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
+    __name    = "PremiumizeMe"
+    __type    = "hook"
+    __version = "0.12"
+
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", ""),
+                ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
+                ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
+
+    __description = """Premiumize.me hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/RPNetBiz.py b/pyload/plugins/hook/RPNetBiz.py
index ed8835ce8..25355520b 100644
--- a/pyload/plugins/hook/RPNetBiz.py
+++ b/pyload/plugins/hook/RPNetBiz.py
@@ -6,18 +6,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class RPNetBiz(MultiHoster):
-    __name__    = "RPNetBiz"
-    __type__    = "hook"
-    __version__ = "0.10"
-
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
-
-    __description__ = """RPNet.biz hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Dman", "dmanugm@gmail.com")]
+    __name    = "RPNetBiz"
+    __type    = "hook"
+    __version = "0.10"
+
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", ""),
+                ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
+                ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
+
+    __description = """RPNet.biz hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Dman", "dmanugm@gmail.com")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/RealdebridCom.py b/pyload/plugins/hook/RealdebridCom.py
index a6f79a97d..01f7c4fad 100644
--- a/pyload/plugins/hook/RealdebridCom.py
+++ b/pyload/plugins/hook/RealdebridCom.py
@@ -5,19 +5,19 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class RealdebridCom(MultiHoster):
-    __name__    = "RealdebridCom"
-    __type__    = "hook"
-    __version__ = "0.43"
-
-    __config__ = [("https", "bool", "Enable HTTPS", False),
-                  ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
-
-    __description__ = """Real-Debrid.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
+    __name    = "RealdebridCom"
+    __type    = "hook"
+    __version = "0.43"
+
+    __config = [("https", "bool", "Enable HTTPS", False),
+                ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", ""),
+                ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
+                ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
+
+    __description = """Real-Debrid.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/RehostTo.py b/pyload/plugins/hook/RehostTo.py
index 6c334bf06..ce1dee59c 100644
--- a/pyload/plugins/hook/RehostTo.py
+++ b/pyload/plugins/hook/RehostTo.py
@@ -5,18 +5,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class RehostTo(MultiHoster):
-    __name__    = "RehostTo"
-    __type__    = "hook"
-    __version__ = "0.43"
-
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
-
-    __description__ = """Rehost.to hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+    __name    = "RehostTo"
+    __type    = "hook"
+    __version = "0.43"
+
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", ""),
+                ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
+                ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
+
+    __description = """Rehost.to hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/SimplyPremiumCom.py b/pyload/plugins/hook/SimplyPremiumCom.py
index 8c32cbf7a..b4e173521 100644
--- a/pyload/plugins/hook/SimplyPremiumCom.py
+++ b/pyload/plugins/hook/SimplyPremiumCom.py
@@ -6,18 +6,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class SimplyPremiumCom(MultiHoster):
-    __name__    = "SimplyPremiumCom"
-    __type__    = "hook"
-    __version__ = "0.02"
-
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to standard download if download fails", "False"),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", "24")]
-
-    __description__ = """Simply-Premium.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("EvolutionClip", "evolutionclip@live.de")]
+    __name    = "SimplyPremiumCom"
+    __type    = "hook"
+    __version = "0.02"
+
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", ""),
+                ("unloadFailing", "bool", "Revert to standard download if download fails", "False"),
+                ("interval", "int", "Reload interval in hours (0 to disable)", "24")]
+
+    __description = """Simply-Premium.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("EvolutionClip", "evolutionclip@live.de")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/SimplydebridCom.py b/pyload/plugins/hook/SimplydebridCom.py
index 89d8cb752..a6e00aae0 100644
--- a/pyload/plugins/hook/SimplydebridCom.py
+++ b/pyload/plugins/hook/SimplydebridCom.py
@@ -5,16 +5,16 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class SimplydebridCom(MultiHoster):
-    __name__    = "SimplydebridCom"
-    __type__    = "hook"
-    __version__ = "0.01"
+    __name    = "SimplydebridCom"
+    __type    = "hook"
+    __version = "0.01"
 
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", "")]
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", "")]
 
-    __description__ = """Simply-Debrid.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
+    __description = """Simply-Debrid.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/UnrestrictLi.py b/pyload/plugins/hook/UnrestrictLi.py
index 255cee43d..d48e8587e 100644
--- a/pyload/plugins/hook/UnrestrictLi.py
+++ b/pyload/plugins/hook/UnrestrictLi.py
@@ -6,19 +6,19 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class UnrestrictLi(MultiHoster):
-    __name__    = "UnrestrictLi"
-    __type__    = "hook"
-    __version__ = "0.02"
-
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to standard download if download fails", False),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", 24),
-                  ("history", "bool", "Delete History", False)]
-
-    __description__ = """Unrestrict.li hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __name    = "UnrestrictLi"
+    __type    = "hook"
+    __version = "0.02"
+
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", ""),
+                ("unloadFailing", "bool", "Revert to standard download if download fails", False),
+                ("interval", "int", "Reload interval in hours (0 to disable)", 24),
+                ("history", "bool", "Delete History", False)]
+
+    __description = """Unrestrict.li hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def getHoster(self):
diff --git a/pyload/plugins/hook/XFileSharingPro.py b/pyload/plugins/hook/XFileSharingPro.py
index cc4fc760d..698da482f 100644
--- a/pyload/plugins/hook/XFileSharingPro.py
+++ b/pyload/plugins/hook/XFileSharingPro.py
@@ -6,20 +6,20 @@ from pyload.plugins.Addon import Addon
 
 
 class XFileSharingPro(Addon):
-    __name__    = "XFileSharingPro"
-    __type__    = "hook"
-    __version__ = "0.26"
+    __name    = "XFileSharingPro"
+    __type    = "hook"
+    __version = "0.26"
 
-    __config__ = [("activated"       , "bool", "Activated"                     , True ),
-                  ("use_hoster_list" , "bool", "Load listed hosters only"      , True ),
-                  ("use_crypter_list", "bool", "Load listed crypters only"     , False),
-                  ("use_builtin_list", "bool", "Load built-in plugin list"     , True ),
-                  ("hoster_list"     , "str" , "Hoster list (comma separated)" , ""   ),
-                  ("crypter_list"    , "str" , "Crypter list (comma separated)", ""   )]
+    __config = [("activated"       , "bool", "Activated"                     , True ),
+                ("use_hoster_list" , "bool", "Load listed hosters only"      , True ),
+                ("use_crypter_list", "bool", "Load listed crypters only"     , False),
+                ("use_builtin_list", "bool", "Load built-in plugin list"     , True ),
+                ("hoster_list"     , "str" , "Hoster list (comma separated)" , ""   ),
+                ("crypter_list"    , "str" , "Crypter list (comma separated)", ""   )]
 
-    __description__ = """Load XFileSharingPro based hosters and crypter which don't need a own plugin to run"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Load XFileSharingPro based hosters and crypter which don't need a own plugin to run"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     # event_list = ["pluginConfigChanged"]
@@ -40,7 +40,7 @@ class XFileSharingPro(Addon):
     CRYPTER_LIST = []
 
 
-    # def pluginConfigChanged(self.__name__, plugin, name, value):
+    # def pluginConfigChanged(self.__name, plugin, name, value):
         # self.loadPattern()
 
 
diff --git a/pyload/plugins/hook/ZeveraCom.py b/pyload/plugins/hook/ZeveraCom.py
index 21fdf6c92..6ff99b142 100644
--- a/pyload/plugins/hook/ZeveraCom.py
+++ b/pyload/plugins/hook/ZeveraCom.py
@@ -5,16 +5,16 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 
 class ZeveraCom(MultiHoster):
-    __name__    = "ZeveraCom"
-    __type__    = "hook"
-    __version__ = "0.02"
+    __name    = "ZeveraCom"
+    __type    = "hook"
+    __version = "0.02"
 
-    __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", "")]
+    __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                ("hosterList", "str", "Hoster list (comma separated)", "")]
 
-    __description__ = """Real-Debrid.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Real-Debrid.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def getHoster(self):