diff options
| author |  Armin <Armin@Armin-PC.diedering.lan>
| 2015-04-12 18:34:55 +0200 |
|---|---|---|
| committer | Armin <Armin@Armin-PC.diedering.lan>
| 2015-04-12 18:34:55 +0200 |
| commit | 3a82d5f45ffed16d654220efa92ef6b75ea3163b (patch) | |
| tree | 8ab6550e7afa428240b105e77d2e204713eb257c /pyload/plugin/captcha | |
| parent | fix, fix and more fixes (diff) | |
| download | pyload-3a82d5f45ffed16d654220efa92ef6b75ea3163b.tar.xz | |
import fixes + code-cleanup
Diffstat (limited to 'pyload/plugin/captcha')
| -rw-r--r-- | pyload/plugin/captcha/ReCaptcha.py | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/pyload/plugin/captcha/ReCaptcha.py b/pyload/plugin/captcha/ReCaptcha.py index b1dfd813c..410cb19de 100644 --- a/pyload/plugin/captcha/ReCaptcha.py +++ b/pyload/plugin/captcha/ReCaptcha.py @@ -137,26 +137,26 @@ class ReCaptcha(Captcha): millis, rpc = self._prepareTimeAndRpc() html = self.plugin.req.load("https://www.google.com/recaptcha/api2/anchor", - get={'k': key, - 'hl': language, - 'v': vers, - 'usegapi': "1", - 'jsh': "%s#id=IO_%s" % (jsh, millis), - 'parent': parent, - 'pfname': "", + get={'k' : key, + 'hl' : language, + 'v' : vers, + 'usegapi' : "1", + 'jsh' : "%s#id=IO_%s" % (jsh, millis), + 'parent' : parent, + 'pfname' : "", 'rpctoken': rpc}) token1 = re.search(r'id="recaptcha-token" value="(.*?)">', html) self.logDebug("Token #1: %s" % token1.group(1)) html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame", - get={'c': token1.group(1), - 'hl': language, - 'v': vers, - 'bg': botguardstring, - 'k': key, + get={'c' : token1.group(1), + 'hl' : language, + 'v' : vers, + 'bg' : botguardstring, + 'k' : key, 'usegapi': "1", - 'jsh': jsh}).decode('unicode-escape') + 'jsh' : jsh}).decode('unicode-escape') token2 = re.search(r'"finput","(.*?)",', html) self.logDebug("Token #2: %s" % token2.group(1)) @@ -165,10 +165,10 @@ class ReCaptcha(Captcha): self.logDebug("Token #3: %s" % token3.group(1)) html = self.plugin.req.load("https://www.google.com/recaptcha/api2/reload", - post={'k': key, - 'c': token2.group(1), + post={'k' : key, + 'c' : token2.group(1), 'reason': "fi", - 'fbg': token3.group(1)}) + 'fbg' : token3.group(1)}) token4 = re.search(r'"rresp","(.*?)",', html) self.logDebug("Token #4: %s" % token4.group(1)) @@ -186,12 +186,12 @@ class ReCaptcha(Captcha): timeToSolveMore = timeToSolve + int(float("0." + str(randint(1, 99999999))) * 500) html = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify", - post={'k': key, - 'c': token4.group(1), + post={'k' : key, + 'c' : token4.group(1), 'response': response, - 't': timeToSolve, - 'ct': timeToSolveMore, - 'bg': botguardstring}) + 't' : timeToSolve, + 'ct' : timeToSolveMore, + 'bg' : botguardstring}) token5 = re.search(r'"uvresp","(.*?)",', html) self.logDebug("Token #5: %s" % token5.group(1)) |