From cf6531b2c87fea99fd03884636bac4c80d1b475d Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 4 Oct 2015 20:09:55 +0200 Subject: Fixpack (3) --- module/plugins/captcha/AdYouLike.py | 2 +- module/plugins/captcha/AdsCaptcha.py | 4 ++-- module/plugins/captcha/ReCaptcha.py | 4 ++-- module/plugins/captcha/SolveMedia.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'module/plugins/captcha') diff --git a/module/plugins/captcha/AdYouLike.py b/module/plugins/captcha/AdYouLike.py index cac73774a..b10d2c399 100644 --- a/module/plugins/captcha/AdYouLike.py +++ b/module/plugins/captcha/AdYouLike.py @@ -31,7 +31,7 @@ class AdYouLike(CaptchaService): self.log_debug("Ayl: %s | Callback: %s" % self.key) return self.key #: Key is the tuple(ayl, callback) else: - self.log_warning(_("Ayl or callback pattern not found")) + self.log_debug("Ayl or callback pattern not found") return None diff --git a/module/plugins/captcha/AdsCaptcha.py b/module/plugins/captcha/AdsCaptcha.py index 613283e53..7dc51565f 100644 --- a/module/plugins/captcha/AdsCaptcha.py +++ b/module/plugins/captcha/AdsCaptcha.py @@ -18,7 +18,7 @@ class AdsCaptcha(CaptchaService): CAPTCHAID_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?.*?CaptchaId=(\d+)' - PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?.*?PublicKey=([\w-]+)' + PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?.*?PublicKey=([\w\-]+)' def detect_key(self, data=None): @@ -31,7 +31,7 @@ class AdsCaptcha(CaptchaService): self.log_debug("Key: %s | ID: %s" % self.key) return self.key else: - self.log_warning(_("Key or id pattern not found")) + self.log_debug("Key or id pattern not found") return None diff --git a/module/plugins/captcha/ReCaptcha.py b/module/plugins/captcha/ReCaptcha.py index a3ac52cb1..379956be6 100644 --- a/module/plugins/captcha/ReCaptcha.py +++ b/module/plugins/captcha/ReCaptcha.py @@ -23,8 +23,8 @@ class ReCaptcha(CaptchaService): ("zapp-brannigan", "fuerst.reinje@web.de")] - KEY_V1_PATTERN = r'(?:recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=|Recaptcha\.create\s*\(\s*["\'])([\w-]+)' - KEY_V2_PATTERN = r'(?:data-sitekey=["\']|["\']sitekey["\']:\s*["\'])([\w-]+)' + KEY_V1_PATTERN = r'(?:recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=|Recaptcha\.create\s*\(\s*["\'])([\w\-]+)' + KEY_V2_PATTERN = r'(?:data-sitekey=["\']|["\']sitekey["\']:\s*["\'])([\w\-]+)' def detect_key(self, data=None): diff --git a/module/plugins/captcha/SolveMedia.py b/module/plugins/captcha/SolveMedia.py index a5a49b68e..302d229b8 100644 --- a/module/plugins/captcha/SolveMedia.py +++ b/module/plugins/captcha/SolveMedia.py @@ -29,7 +29,7 @@ class SolveMedia(CaptchaService): self.log_debug("Key: %s" % self.key) return self.key else: - self.log_warning(_("Key pattern not found")) + self.log_debug("Key pattern not found") return None -- cgit v1.2.3