diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-01 13:05:40 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-01 13:05:40 +0200 |
| commit | 095ad393330d9ccb86adac4894fe3280caa44234 (patch) | |
| tree | f03b4a5674b4f6e79706350e06543ba565effd85 /pyload/plugin/hoster/FastshareCz.py | |
| parent | Use bitmath lib to formatSize (diff) | |
| parent | Fix https://github.com/pyload/pyload/issues/1351 (diff) | |
| download | pyload-095ad393330d9ccb86adac4894fe3280caa44234.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
module/plugins/hoster/RehostTo.py
module/plugins/hoster/XVideosCom.py
module/plugins/hoster/ZeveraCom.py
module/plugins/internal/CaptchaService.py
pyload/plugin/account/FilefactoryCom.py
pyload/plugin/account/OneFichierCom.py
pyload/plugin/account/WebshareCz.py
pyload/plugin/addon/AntiVirus.py
pyload/plugin/addon/Checksum.py
pyload/plugin/addon/ExtractArchive.py
pyload/plugin/container/CCF.py
pyload/plugin/crypter/Go4UpCom.py
pyload/plugin/hook/BypassCaptcha.py
pyload/plugin/hook/CaptchaBrotherhood.py
pyload/plugin/hook/ExpertDecoders.py
pyload/plugin/hook/ImageTyperz.py
pyload/plugin/hook/XFileSharingPro.py
pyload/plugin/hoster/Ftp.py
pyload/plugin/hoster/GigapetaCom.py
pyload/plugin/hoster/MegaRapidCz.py
pyload/plugin/hoster/MegaRapidoNet.py
pyload/plugin/hoster/MultishareCz.py
pyload/plugin/hoster/NarodRu.py
pyload/plugin/hoster/QuickshareCz.py
pyload/plugin/hoster/RapidgatorNet.py
pyload/plugin/hoster/RapiduNet.py
pyload/plugin/hoster/UnibytesCom.py
pyload/plugin/hoster/UploadingCom.py
pyload/plugin/hoster/WrzucTo.py
pyload/plugin/internal/BasePlugin.py
pyload/plugin/internal/SimpleDereferer.py
pyload/plugin/internal/SimpleHoster.py
pyload/plugin/internal/XFSCrypter.py
pyload/plugin/internal/XFSHoster.py
Diffstat (limited to 'pyload/plugin/hoster/FastshareCz.py')
| -rw-r--r-- | pyload/plugin/hoster/FastshareCz.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pyload/plugin/hoster/FastshareCz.py b/pyload/plugin/hoster/FastshareCz.py index a98a7de31..7e688a941 100644 --- a/pyload/plugin/hoster/FastshareCz.py +++ b/pyload/plugin/hoster/FastshareCz.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- import re - -from urlparse import urljoin +import urlparse from pyload.plugin.internal.SimpleHoster import SimpleHoster @@ -55,8 +54,8 @@ class FastshareCz(SimpleHoster): self.error(_("FREE_URL_PATTERN not found")) baseurl = "http://www.fastshare.cz" - captcha = self.decryptCaptcha(urljoin(baseurl, captcha_src)) - self.download(urljoin(baseurl, action), post={'code': captcha, 'btn.x': 77, 'btn.y': 18}) + captcha = self.decryptCaptcha(urlparse.urljoin(baseurl, captcha_src)) + self.download(urlparse.urljoin(baseurl, action), post={'code': captcha, 'btn.x': 77, 'btn.y': 18}) def checkFile(self, rules={}): |