diff options
author | Bambie42 <Bambie42@users.noreply.github.com> | 2015-08-26 14:36:59 +0200 |
---|---|---|
committer | Bambie42 <Bambie42@users.noreply.github.com> | 2015-08-26 14:36:59 +0200 |
commit | 47ce7cd62c62d476094070e8d833033209c035e1 (patch) | |
tree | 12b1161863f1c1ff36bc417a6a106ef3b69827d0 | |
parent | Spare plugin updates (diff) | |
download | pyload-47ce7cd62c62d476094070e8d833033209c035e1.tar.xz |
partly fixes #1756
-rw-r--r-- | module/plugins/crypter/LinkCryptWs.py | 13 | ||||
-rw-r--r-- | module/plugins/internal/Captcha.py | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index af13f55f6..557a63cbd 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -31,7 +31,6 @@ class LinkCryptWs(Crypter): def setup(self): - self.captcha = False self.links = [] self.sources = ['cnl', 'web', 'dlc', 'rsdf', 'ccf'] @@ -60,7 +59,6 @@ class LinkCryptWs(Crypter): self.retry(8, 15, _("Can't handle Key-Captcha")) if self.is_captcha_protected(): - self.captcha = True self.unlock_captcha_protection() self.handle_captcha_errors() @@ -165,12 +163,11 @@ class LinkCryptWs(Crypter): def handle_captcha_errors(self): - if self.captcha: - if "Your choice was wrong!" in self.html: - self.captcha.invalid() - self.retry() - else: - self.captcha.correct() + if "Your choice was wrong!" in self.html: + self.captcha.invalid() + self.retry() + else: + self.captcha.correct() def handle_link_source(self, type): diff --git a/module/plugins/internal/Captcha.py b/module/plugins/internal/Captcha.py index c08050ee8..600fd1d34 100644 --- a/module/plugins/internal/Captcha.py +++ b/module/plugins/internal/Captcha.py @@ -120,7 +120,7 @@ class Captcha(Plugin): self.log_warning(_("Error removing: %s") % tmp_img.name, e) traceback.print_exc() - self.log_info(_("Captcha result: ") + result) #@TODO: Remove from here? + #self.log_info(_("Captcha result: ") + result) #@TODO: Remove from here? return result |