Fix previous merge

8 files changed, 6 insertions, 46 deletions

diff --git a/pyload/plugins/hook/BypassCaptcha.py b/pyload/plugins/hook/BypassCaptcha.py
index b6e237b37..728abf6ed 100644
--- a/pyload/plugins/hook/BypassCaptcha.py
+++ b/pyload/plugins/hook/BypassCaptcha.py
@@ -47,11 +47,6 @@ class BypassCaptcha(Hook):
     GETCREDITS_URL = "http://bypasscaptcha.com/ex_left.php"
 
 
-    #@TODO: Remove in 0.4.10
-    def initPeriodical(self):
-        pass
-
-
     def getCredits(self):
         res = getURL(self.GETCREDITS_URL, post={"key": self.getConfig("passkey")})
 
diff --git a/pyload/plugins/hook/Captcha9kw.py b/pyload/plugins/hook/Captcha9kw.py
index ed1b27646..9f0f80c2d 100644
--- a/pyload/plugins/hook/Captcha9kw.py
+++ b/pyload/plugins/hook/Captcha9kw.py
@@ -39,11 +39,6 @@ class Captcha9kw(Hook):
     API_URL = "http://www.9kw.eu/index.cgi"
 
 
-    #@TODO: Remove in 0.4.10
-    def initPeriodical(self):
-        pass
-
-
     def coreReady(self):
         if self.getConfig("ssl"):
             self.API_URL = self.API_URL.replace("http://", "https://")
diff --git a/pyload/plugins/hook/CaptchaBrotherhood.py b/pyload/plugins/hook/CaptchaBrotherhood.py
index 1f3aebd85..355081630 100644
--- a/pyload/plugins/hook/CaptchaBrotherhood.py
+++ b/pyload/plugins/hook/CaptchaBrotherhood.py
@@ -53,11 +53,6 @@ class CaptchaBrotherhood(Hook):
     API_URL = "http://www.captchabrotherhood.com/"
 
 
-    #@TODO: Remove in 0.4.10
-    def initPeriodical(self):
-        pass
-
-
     def getCredits(self):
         res = getURL(self.API_URL + "askCredits.aspx",
                      get={"username": self.getConfig("username"), "password": self.getConfig("passkey")})
diff --git a/pyload/plugins/hook/DeathByCaptcha.py b/pyload/plugins/hook/DeathByCaptcha.py
index dc737020c..c076bdcee 100644
--- a/pyload/plugins/hook/DeathByCaptcha.py
+++ b/pyload/plugins/hook/DeathByCaptcha.py
@@ -66,11 +66,6 @@ class DeathByCaptcha(Hook):
     API_URL = "http://api.dbcapi.me/api/"
 
 
-    #@TODO: Remove in 0.4.10
-    def initPeriodical(self):
-        pass
-
-
     def call_api(self, api="captcha", post=False, multipart=False):
         req = getRequest()
         req.c.setopt(HTTPHEADER, ["Accept: application/json", "User-Agent: pyLoad %s" % self.core.version])
diff --git a/pyload/plugins/hook/ExpertDecoders.py b/pyload/plugins/hook/ExpertDecoders.py
index dbd03c30c..c9da38fe9 100644
--- a/pyload/plugins/hook/ExpertDecoders.py
+++ b/pyload/plugins/hook/ExpertDecoders.py
@@ -28,11 +28,6 @@ class ExpertDecoders(Hook):
     API_URL = "http://www.fasttypers.org/imagepost.ashx"
 
 
-    #@TODO: Remove in 0.4.10
-    def initPeriodical(self):
-        pass
-
-
     def getCredits(self):
         res = getURL(self.API_URL, post={"key": self.getConfig("passkey"), "action": "balance"})
 
diff --git a/pyload/plugins/hook/ImageTyperz.py b/pyload/plugins/hook/ImageTyperz.py
index c0b046787..5e35a61e4 100644
--- a/pyload/plugins/hook/ImageTyperz.py
+++ b/pyload/plugins/hook/ImageTyperz.py
@@ -49,11 +49,6 @@ class ImageTyperz(Hook):
     GETCREDITS_URL = "http://captchatypers.com/Forms/RequestBalance.ashx"
 
 
-    #@TODO: Remove in 0.4.10
-    def initPeriodical(self):
-        pass
-
-
     def getCredits(self):
         res = getURL(self.GETCREDITS_URL,
                      post={'action': "REQUESTBALANCE",
diff --git a/pyload/plugins/hook/LinkdecrypterCom.py b/pyload/plugins/hook/LinkdecrypterCom.py
index 15697e0a2..e99d79b7f 100644
--- a/pyload/plugins/hook/LinkdecrypterCom.py
+++ b/pyload/plugins/hook/LinkdecrypterCom.py
@@ -17,11 +17,6 @@ class LinkdecrypterCom(Hook):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    #@TODO: Remove in 0.4.10
-    def initPeriodical(self):
-        pass
-
-
     def coreReady(self):
         try:
             self.loadPatterns()
diff --git a/pyload/plugins/hook/XFileSharingPro.py b/pyload/plugins/hook/XFileSharingPro.py
index fc8c37127..17baed8b2 100644
--- a/pyload/plugins/hook/XFileSharingPro.py
+++ b/pyload/plugins/hook/XFileSharingPro.py
@@ -10,12 +10,12 @@ class XFileSharingPro(Hook):
     __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"
@@ -44,11 +44,6 @@ class XFileSharingPro(Hook):
         # self.loadPattern()
 
 
-    #@TODO: Remove in 0.4.10
-    def initPeriodical(self):
-        pass
-
-
     def coreReady(self):
         self.loadPattern()