From d7254f602f1ba5140603e2651fb9e2950690a7a5 Mon Sep 17 00:00:00 2001 From: Stefano Date: Mon, 25 Nov 2013 03:27:49 -0800 Subject: Merge pull request #418 from vuolter/s/internal_PEP8cleanup Internal plugins code cleanup according to PEP8 guidelines (cherry picked from commit cfe3b21334f3eef319a667a477634c025e757fbf) Conflicts: module/plugins/internal/MultiHoster.py pyload/plugins/internal/CaptchaService.py --- pyload/plugins/internal/CaptchaService.py | 33 ++++++++++++++++++------------- 1 file changed, 19 insertions(+), 14 deletions(-) (limited to 'pyload/plugins/internal/CaptchaService.py') diff --git a/pyload/plugins/internal/CaptchaService.py b/pyload/plugins/internal/CaptchaService.py index 4f903e3e6..d4d0c9979 100644 --- a/pyload/plugins/internal/CaptchaService.py +++ b/pyload/plugins/internal/CaptchaService.py @@ -1,4 +1,5 @@ # -*- 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 @@ -18,47 +19,51 @@ import re + class CaptchaService(): __version__ = "0.02" - + def __init__(self, plugin): self.plugin = plugin - + + class ReCaptcha(): def __init__(self, plugin): self.plugin = plugin - + def challenge(self, id): - js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={"k":id}, cookies=True) - + js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={"k": id}, cookies=True) + try: challenge = re.search("challenge : '(.*?)',", js).group(1) server = re.search("server : '(.*?)',", js).group(1) except: self.plugin.fail("recaptcha error") - result = self.result(server,challenge) - + result = self.result(server, challenge) + return challenge, result def result(self, server, challenge): - return self.plugin.decryptCaptcha("%simage"%server, get={"c":challenge}, cookies=True, forceUser=True, imgtype="jpg") + return self.plugin.decryptCaptcha("%simage" % server, get={"c": challenge}, cookies=True, forceUser=True, imgtype="jpg") + class AdsCaptcha(CaptchaService): def challenge(self, src): js = self.plugin.req.load(src, cookies=True) - + try: challenge = re.search("challenge: '(.*?)',", js).group(1) server = re.search("server: '(.*?)',", js).group(1) except: self.plugin.fail("adscaptcha error") - result = self.result(server,challenge) - + result = self.result(server, challenge) + return challenge, result def result(self, server, challenge): return self.plugin.decryptCaptcha("%sChallenge.aspx" % server, get={"cid": challenge, "dummy": random()}, cookies=True, imgtype="jpg") + class SolveMedia(CaptchaService): def challenge(self, src): @@ -68,8 +73,8 @@ class SolveMedia(CaptchaService): except: self.plugin.fail("solvmedia error") result = self.result(challenge) - + return challenge, result - def result(self,challenge): - return self.plugin.decryptCaptcha("http://api.solvemedia.com/papi/media?c=%s" % challenge,imgtype="gif") \ No newline at end of file + def result(self, challenge): + return self.plugin.decryptCaptcha("http://api.solvemedia.com/papi/media?c=%s" % challenge, imgtype="gif") -- cgit v1.2.3