diff options
author | 2015-09-26 18:24:29 +0200 | |
---|---|---|
committer | 2015-09-26 18:24:29 +0200 | |
commit | 93a0c1d930520c055eae766b5dad305111a02c4d (patch) | |
tree | 8ac3f9e6dcf682775f5b170f2a9ca40eb7c0f8fc /module/plugins/hoster/FileboomMe.py | |
parent | Spare plugin updates (diff) | |
parent | Merge pull request #1850 from chaosblog/patch-2 (diff) | |
download | pyload-93a0c1d930520c055eae766b5dad305111a02c4d.tar.xz |
Merge pull request #1 from pyload/stable
Merge actual version
Diffstat (limited to 'module/plugins/hoster/FileboomMe.py')
-rw-r--r-- | module/plugins/hoster/FileboomMe.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/module/plugins/hoster/FileboomMe.py b/module/plugins/hoster/FileboomMe.py index 3c11f1d16..4328565f4 100644 --- a/module/plugins/hoster/FileboomMe.py +++ b/module/plugins/hoster/FileboomMe.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- import re - -from urlparse import urljoin +import urlparse from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo @@ -37,7 +36,7 @@ class FileboomMe(SimpleHoster): def handle_free(self, pyfile): - post_url = urljoin(pyfile.url, "file/" + self.info['pattern']['ID']) + post_url = urlparse.urljoin(pyfile.url, "file/" + self.info['pattern']['ID']) m = re.search(r'data-slow-id="(\w+)"', self.html) if m: @@ -46,7 +45,7 @@ class FileboomMe(SimpleHoster): m = re.search(self.LINK_PATTERN, self.html) if m: - self.link = urljoin(pyfile.url, m.group(0)) + self.link = urlparse.urljoin(pyfile.url, m.group(0)) else: for _i in xrange(5): @@ -56,7 +55,7 @@ class FileboomMe(SimpleHoster): m = re.search(self.CAPTCHA_PATTERN, self.html) if m: - captcha = self.captcha.decrypt(urljoin(pyfile.url, m.group(1))) + captcha = self.captcha.decrypt(urlparse.urljoin(pyfile.url, m.group(1))) self.html = self.load(post_url, post={'CaptchaForm[code]' : captcha, @@ -76,7 +75,7 @@ class FileboomMe(SimpleHoster): m = re.search(self.LINK_PATTERN, self.html) if m: - self.link = urljoin(pyfile.url, m.group(0)) + self.link = urlparse.urljoin(pyfile.url, m.group(0)) else: self.captcha.invalid() |