diff options
author | Walter Purcaro <vuolter@gmail.com> | 2014-11-26 22:19:01 +0100 |
---|---|---|
committer | Walter Purcaro <vuolter@gmail.com> | 2014-11-26 22:19:01 +0100 |
commit | 4a7f6177152d3c59c92291aa76fd7a36a1c8b044 (patch) | |
tree | 9796b6c6f4be98dd29dba0d9f92cc44756da8b3a /pyload/plugins/hoster/TurbobitNet.py | |
parent | Merge branch 'stable' into 0.4.10 (diff) | |
parent | [XFSHoster] Code improvements (diff) | |
download | pyload-4a7f6177152d3c59c92291aa76fd7a36a1c8b044.tar.xz |
Merge branch 'stable' into 0.4.10
Conflicts:
module/PluginThread.py
module/plugins/hoster/XFileSharingPro.py
module/plugins/internal/CaptchaService.py
pyload/api/__init__.py
pyload/manager/AccountManager.py
pyload/manager/AddonManager.py
pyload/manager/CaptchaManager.py
pyload/manager/PluginManager.py
pyload/network/HTTPRequest.py
pyload/network/XDCCRequest.py
pyload/plugins/Plugin.py
pyload/plugins/account/EasybytezCom.py
pyload/plugins/crypter/C1neonCom.py
pyload/plugins/crypter/CryptItCom.py
pyload/plugins/crypter/DuploadOrg.py
pyload/plugins/crypter/FilebeerInfo.py
pyload/plugins/crypter/FilesonicCom.py
pyload/plugins/crypter/FiredriveCom.py
pyload/plugins/crypter/HotfileCom.py
pyload/plugins/crypter/ILoadTo.py
pyload/plugins/crypter/LofCc.py
pyload/plugins/crypter/MBLinkInfo.py
pyload/plugins/crypter/MegauploadCom.py
pyload/plugins/crypter/Movie2kTo.py
pyload/plugins/crypter/MultiuploadCom.py
pyload/plugins/crypter/OronCom.py
pyload/plugins/crypter/RSLayerCom.py
pyload/plugins/crypter/SecuredIn.py
pyload/plugins/crypter/SharingmatrixCom.py
pyload/plugins/crypter/SpeedLoadOrg.py
pyload/plugins/crypter/StealthTo.py
pyload/plugins/crypter/TrailerzoneInfo.py
pyload/plugins/crypter/WiiReloadedOrg.py
pyload/plugins/crypter/WuploadCom.py
pyload/plugins/internal/Account.py
pyload/plugins/internal/Addon.py
pyload/plugins/internal/BasePlugin.py
pyload/plugins/internal/Container.py
pyload/plugins/internal/Crypter.py
pyload/plugins/internal/DeadCrypter.py
pyload/plugins/internal/DeadHoster.py
pyload/plugins/internal/Hoster.py
pyload/plugins/internal/SimpleCrypter.py
pyload/utils/__init__.py
Diffstat (limited to 'pyload/plugins/hoster/TurbobitNet.py')
-rw-r--r-- | pyload/plugins/hoster/TurbobitNet.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pyload/plugins/hoster/TurbobitNet.py b/pyload/plugins/hoster/TurbobitNet.py index b069e7a84..e0691942c 100644 --- a/pyload/plugins/hoster/TurbobitNet.py +++ b/pyload/plugins/hoster/TurbobitNet.py @@ -17,7 +17,7 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, t class TurbobitNet(SimpleHoster): __name__ = "TurbobitNet" __type__ = "hoster" - __version__ = "0.14" + __version__ = "0.15" __pattern__ = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)' @@ -27,7 +27,7 @@ class TurbobitNet(SimpleHoster): ("prOq", None)] - URL_REPLACEMENTS = [(__pattern__, "http://turbobit.net/\g<ID>.html")] + URL_REPLACEMENTS = [(__pattern__ + ".*", "http://turbobit.net/\g<ID>.html")] COOKIES = [("turbobit.net", "user_lang", "en")] |