Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/captcha/OCR.py
	module/plugins/captcha/captcha.py
	module/plugins/crypter/DailymotionBatch.py
	module/plugins/crypter/DailymotionComFolder.py
	module/plugins/crypter/YoutubeBatch.py
	module/plugins/crypter/YoutubeComFolder.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/Extractor.py
	pyload/plugin/OCR.py
	pyload/plugin/account/DebridItaliaCom.py
	pyload/plugin/account/MegaRapidCz.py
	pyload/plugin/account/NoPremiumPl.py
	pyload/plugin/account/RapideoPl.py
	pyload/plugin/addon/AndroidPhoneNotify.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/DeleteFinished.py
	pyload/plugin/addon/DownloadScheduler.py
	pyload/plugin/addon/ExternalScripts.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/addon/IRCInterface.py
	pyload/plugin/addon/JustPremium.py
	pyload/plugin/addon/MergeFiles.py
	pyload/plugin/addon/MultiHome.py
	pyload/plugin/addon/RestartFailed.py
	pyload/plugin/addon/RestartSlow.py
	pyload/plugin/addon/SkipRev.py
	pyload/plugin/addon/UnSkipOnFail.py
	pyload/plugin/addon/UpdateManager.py
	pyload/plugin/addon/WindowsPhoneNotify.py
	pyload/plugin/crypter/DDLMusicOrg.py
	pyload/plugin/crypter/DailymotionBatch.py
	pyload/plugin/crypter/DevhostSt.py
	pyload/plugin/crypter/EmbeduploadCom.py
	pyload/plugin/crypter/MultiloadCz.py
	pyload/plugin/crypter/YoutubeBatch.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/Captcha9Kw.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/DeathByCaptcha.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/AlldebridCom.py
	pyload/plugin/hoster/CzshareCom.py
	pyload/plugin/hoster/EuroshareEu.py
	pyload/plugin/hoster/FastixRu.py
	pyload/plugin/hoster/FastshareCz.py
	pyload/plugin/hoster/GooIm.py
	pyload/plugin/hoster/MediafireCom.py
	pyload/plugin/hoster/MegaDebridEu.py
	pyload/plugin/hoster/NitroflareCom.py
	pyload/plugin/hoster/OverLoadMe.py
	pyload/plugin/hoster/PremiumTo.py
	pyload/plugin/hoster/PremiumizeMe.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RealdebridCom.py
	pyload/plugin/hoster/SimplyPremiumCom.py
	pyload/plugin/hoster/SimplydebridCom.py
	pyload/plugin/hoster/SmoozedCom.py
	pyload/plugin/hoster/SoundcloudCom.py
	pyload/plugin/hoster/UlozTo.py
	pyload/plugin/hoster/UploadableCh.py
	pyload/plugin/hoster/UploadedTo.py
	pyload/plugin/hoster/UploadheroCom.py
	pyload/plugin/hoster/VeehdCom.py
	pyload/plugin/hoster/VimeoCom.py
	pyload/plugin/hoster/ZeveraCom.py
	pyload/plugin/hoster/ZippyshareCom.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/MultiHoster.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSHoster.py
	pyload/plugin/ocr/GigasizeCom.py
	pyload/plugin/ocr/LinksaveIn.py
	pyload/plugin/ocr/NetloadIn.py
	pyload/plugin/ocr/ShareonlineBiz.py

1 files changed, 12 insertions, 10 deletions

diff --git a/pyload/plugin/hook/ImageTyperz.py b/pyload/plugin/hook/ImageTyperz.py
index a9d7326de..a556b109a 100644
--- a/pyload/plugin/hook/ImageTyperz.py
+++ b/pyload/plugin/hook/ImageTyperz.py
@@ -40,10 +40,12 @@ class ImageTyperz(Hook):
 
     __description__ = """Send captchas to ImageTyperz.com"""
     __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __authors__     = [("RaNaN"   , "RaNaN@pyload.org"   ),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
+    interval = 0  #@TODO: Remove in 0.4.10
+
     SUBMIT_URL = "http://captchatypers.com/Forms/UploadFileAndGetTextNEW.ashx"
     RESPOND_URL = "http://captchatypers.com/Forms/SetBadImage.ashx"
     GETCREDITS_URL = "http://captchatypers.com/Forms/RequestBalance.ashx"
@@ -52,8 +54,8 @@ class ImageTyperz(Hook):
     def getCredits(self):
         res = getURL(self.GETCREDITS_URL,
                      post={'action': "REQUESTBALANCE",
-                           'username': self.getConfig("username"),
-                           'password': self.getConfig("passkey")})
+                           'username': self.getConfig('username'),
+                           'password': self.getConfig('passkey')})
 
         if res.startswith('ERROR'):
             raise ImageTyperzException(res)
@@ -74,7 +76,7 @@ class ImageTyperz(Hook):
 
         try:
             #@NOTE: Workaround multipart-post bug in HTTPRequest.py
-            if re.match("^\w*$", self.getConfig("passkey")):
+            if re.match("^\w*$", self.getConfig('passkey')):
                 multipart = True
                 data = (FORM_FILE, captcha)
             else:
@@ -85,8 +87,8 @@ class ImageTyperz(Hook):
 
             res = req.load(self.SUBMIT_URL,
                            post={'action': "UPLOADCAPTCHA",
-                                 'username': self.getConfig("username"),
-                                 'password': self.getConfig("passkey"), "file": data},
+                                 'username': self.getConfig('username'),
+                                 'password': self.getConfig('passkey'), "file": data},
                            multipart=multipart)
         finally:
             req.close()
@@ -110,10 +112,10 @@ class ImageTyperz(Hook):
         if not task.isTextual():
             return False
 
-        if not self.getConfig("username") or not self.getConfig("passkey"):
+        if not self.getConfig('username') or not self.getConfig('passkey'):
             return False
 
-        if self.core.isClientConnected() and not self.getConfig("force"):
+        if self.core.isClientConnected() and not self.getConfig('force'):
             return False
 
         if self.getCredits() > 0:
@@ -130,8 +132,8 @@ class ImageTyperz(Hook):
         if task.data['service'] == self.__name__ and "ticket" in task.data:
             res = getURL(self.RESPOND_URL,
                          post={'action': "SETBADIMAGE",
-                               'username': self.getConfig("username"),
-                               'password': self.getConfig("passkey"),
+                               'username': self.getConfig('username'),
+                               'password': self.getConfig('passkey'),
                                'imageid': task.data['ticket']})
 
             if res == "SUCCESS":