summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/captcha
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/plugins/captcha')
-rw-r--r--pyload/plugins/captcha/AdYouLike.py4
-rw-r--r--pyload/plugins/captcha/AdsCaptcha.py2
-rw-r--r--pyload/plugins/captcha/ReCaptcha.py2
-rw-r--r--pyload/plugins/captcha/SolveMedia.py2
4 files changed, 5 insertions, 5 deletions
diff --git a/pyload/plugins/captcha/AdYouLike.py b/pyload/plugins/captcha/AdYouLike.py
index 9c74e9348..be688e65d 100644
--- a/pyload/plugins/captcha/AdYouLike.py
+++ b/pyload/plugins/captcha/AdYouLike.py
@@ -61,7 +61,7 @@ class AdYouLike(Captcha):
'callback': callback})
try:
challenge = json_loads(re.search(callback + r'\s*\((.+?)\)', html).group(1))
- except:
+ except Exception:
errmsg = _("AdYouLike challenge pattern not found")
self.plugin.error(errmsg)
raise ValueError(errmsg)
@@ -91,7 +91,7 @@ class AdYouLike(Captcha):
try:
instructions_visual = challenge['translations'][server['all']['lang']]['instructions_visual']
result = re.search(u'«(.+?)»', instructions_visual).group(1).strip()
- except:
+ except Exception:
errmsg = _("AdYouLike result not found")
self.plugin.error(errmsg)
raise ValueError(errmsg)
diff --git a/pyload/plugins/captcha/AdsCaptcha.py b/pyload/plugins/captcha/AdsCaptcha.py
index 239d61a19..8655e4f7b 100644
--- a/pyload/plugins/captcha/AdsCaptcha.py
+++ b/pyload/plugins/captcha/AdsCaptcha.py
@@ -56,7 +56,7 @@ class AdsCaptcha(Captcha):
try:
challenge = re.search("challenge: '(.+?)',", html).group(1)
server = re.search("server: '(.+?)',", html).group(1)
- except:
+ except Exception:
errmsg = _("AdsCaptcha challenge pattern not found")
self.plugin.error(errmsg)
raise ValueError(errmsg)
diff --git a/pyload/plugins/captcha/ReCaptcha.py b/pyload/plugins/captcha/ReCaptcha.py
index 7a2ba9362..e12aba36d 100644
--- a/pyload/plugins/captcha/ReCaptcha.py
+++ b/pyload/plugins/captcha/ReCaptcha.py
@@ -51,7 +51,7 @@ class ReCaptcha(Captcha):
try:
challenge = re.search("challenge : '(.+?)',", html).group(1)
server = re.search("server : '(.+?)',", html).group(1)
- except:
+ except Exception:
errmsg = _("ReCaptcha challenge pattern not found")
self.plugin.error(errmsg)
raise ValueError(errmsg)
diff --git a/pyload/plugins/captcha/SolveMedia.py b/pyload/plugins/captcha/SolveMedia.py
index 63db60627..cc48c801b 100644
--- a/pyload/plugins/captcha/SolveMedia.py
+++ b/pyload/plugins/captcha/SolveMedia.py
@@ -32,7 +32,7 @@ class SolveMedia(Captcha):
challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">',
html).group(1)
server = "http://api.solvemedia.com/papi/media"
- except:
+ except Exception:
errmsg = _("SolveMedia challenge pattern not found")
self.plugin.error(errmsg)
raise ValueError(errmsg)