diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-12-01 23:53:07 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-12-01 23:53:07 +0100 |
| commit | 004a80bfaad38f9400e8aebcb8f980353a232295 (patch) | |
| tree | 1e786d2d14a3040767aac237982544b74a9567cb /pyload/plugins/captcha | |
| parent | Fix previous merge (diff) | |
| download | pyload-004a80bfaad38f9400e8aebcb8f980353a232295.tar.xz | |
PEP-8, Python Zen, refactor and reduce code (thx FedeG)
Diffstat (limited to 'pyload/plugins/captcha')
| -rw-r--r-- | pyload/plugins/captcha/AdsCaptcha.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/captcha/ReCaptcha.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/captcha/SolveMedia.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pyload/plugins/captcha/AdsCaptcha.py b/pyload/plugins/captcha/AdsCaptcha.py index d804d9942..fe8fec29b 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: '(.+?)',", js).group(1) server = re.search("server: '(.+?)',", js).group(1) - except: + except Exception: self.plugin.error(_("AdsCaptcha challenge pattern not found")) result = self.result(server, challenge) diff --git a/pyload/plugins/captcha/ReCaptcha.py b/pyload/plugins/captcha/ReCaptcha.py index c4054c29b..8e4d8c27c 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 : '(.+?)',", js).group(1) server = re.search("server : '(.+?)',", js).group(1) - except: + except Exception: self.plugin.error(_("ReCaptcha challenge pattern not found")) result = self.result(server, challenge) diff --git a/pyload/plugins/captcha/SolveMedia.py b/pyload/plugins/captcha/SolveMedia.py index 6420fc326..5d5f6ea9a 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: self.plugin.error(_("SolveMedia challenge pattern not found")) result = self.result(server, challenge) |