diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-03-28 01:59:01 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-03-28 01:59:01 +0100 |
| commit | 589121e80835c63aea0880a53c6678de5c31c16e (patch) | |
| tree | a5acb58c9b06dd80a46cec888520559d115733c3 /module/plugins/internal | |
| parent | [UlozTo] Update hoster (diff) | |
| download | pyload-589121e80835c63aea0880a53c6678de5c31c16e.tar.xz | |
Spare code cosmetics
Diffstat (limited to 'module/plugins/internal')
| -rw-r--r-- | module/plugins/internal/CaptchaService.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py index fcb8f0095..3978a96c4 100644 --- a/module/plugins/internal/CaptchaService.py +++ b/module/plugins/internal/CaptchaService.py @@ -251,8 +251,8 @@ class AdsCaptcha(CaptchaService): __authors__ = [("pyLoad Team", "admin@pyload.org")] - CAPTCHAID_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(\d+)' - PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*PublicKey=([\w-]+)' + CAPTCHAID_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?.*?CaptchaId=(\d+)' + PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?.*?PublicKey=([\w-]+)' def detect_key(self, html=None): @@ -358,7 +358,7 @@ class SolveMedia(CaptchaService): html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript", get={'k': key}) try: - challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">', + challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="(.+?)">', html).group(1) server = "http://api.solvemedia.com/papi/media" |