Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/Account.py
	module/plugins/AccountManager.py
	module/plugins/Hook.py
	module/plugins/OCR.py
	module/plugins/Plugin.py
	module/plugins/PluginManager.py
	module/plugins/ReCaptcha.py
	module/plugins/accounts/Ftp.py
	module/plugins/accounts/Http.py
	module/plugins/internal/MultiHoster.py
	module/plugins/ocr/GigasizeCom.py
	module/plugins/ocr/LinksaveIn.py
	module/plugins/ocr/NetloadIn.py
	module/plugins/ocr/ShareonlineBiz.py

1 files changed, 11 insertions, 24 deletions

diff --git a/module/plugins/hooks/ExpertDecoders.py b/module/plugins/hooks/ExpertDecoders.py
index 7be30f86e..c7ab80da0 100644
--- a/module/plugins/hooks/ExpertDecoders.py
+++ b/module/plugins/hooks/ExpertDecoders.py
@@ -1,46 +1,33 @@
 # -*- coding: utf-8 -*-
 
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License,
-    or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-    @author: mkaay, RaNaN, zoidberg
-"""
 from __future__ import with_statement
 
-from thread import start_new_thread
+from base64 import b64encode
 from pycurl import LOW_SPEED_TIME
+from thread import start_new_thread
 from uuid import uuid4
-from base64 import b64encode
 
-from module.network.RequestFactory import getURL, getRequest
 from module.network.HTTPRequest import BadHeader
-
+from module.network.RequestFactory import getURL, getRequest
 from module.plugins.Hook import Hook
 
 
 class ExpertDecoders(Hook):
     __name__ = "ExpertDecoders"
+    __type__ = "hook"
     __version__ = "0.01"
-    __description__ = """Send captchas to expertdecoders.com"""
+
     __config__ = [("activated", "bool", "Activated", False),
                   ("force", "bool", "Force CT even if client is connected", False),
                   ("passkey", "password", "Access key", "")]
+
+    __description__ = """Send captchas to expertdecoders.com"""
     __author_name__ = ("RaNaN", "zoidberg")
     __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")
 
     API_URL = "http://www.fasttypers.org/imagepost.ashx"
 
+
     def setup(self):
         self.info = {}
 
@@ -49,14 +36,14 @@ class ExpertDecoders(Hook):
 
         if response.isdigit():
             self.logInfo(_("%s credits left") % response)
-            self.info["credits"] = credits = int(response)
+            self.info['credits'] = credits = int(response)
             return credits
         else:
             self.logError(response)
             return 0
 
     def processCaptcha(self, task):
-        task.data["ticket"] = ticket = uuid4()
+        task.data['ticket'] = ticket = uuid4()
         result = None
 
         with open(task.captchaFile, 'rb') as f:
@@ -100,7 +87,7 @@ class ExpertDecoders(Hook):
 
             try:
                 response = getURL(self.API_URL, post={"action": "refund", "key": self.getConfig("passkey"),
-                                                      "gen_task_id": task.data["ticket"]})
+                                                      "gen_task_id": task.data['ticket']})
                 self.logInfo("Request refund: %s" % response)
 
             except BadHeader, e: