diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-10-07 19:54:24 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-10-07 19:54:24 +0200 |
| commit | be459e0b409dcd5e04edd75be374bd35d4018e9a (patch) | |
| tree | 3f73e813d20608ff0d23eada8214a5124c85bff5 /pyload/plugins/hoster/TurbobitNet.py | |
| parent | Merge branch 'stable' into 0.4.10 (diff) | |
| parent | New __authors__ key replaces __author_name__ and __author_mail__ + Whitespace... (diff) | |
| download | pyload-be459e0b409dcd5e04edd75be374bd35d4018e9a.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
module/plugins/internal/CaptchaService.py
pyload/plugins/account/EasybytezCom.py
pyload/plugins/account/TusfilesNet.py
pyload/plugins/base/OCR.py
pyload/plugins/crypter/MultiuploadCom.py
pyload/plugins/crypter/UploadableChFolder.py
pyload/plugins/hoster/DuploadOrg.py
pyload/plugins/hoster/EpicShareNet.py
pyload/plugins/hoster/LemUploadsCom.py
pyload/plugins/hoster/LoadTo.py
pyload/plugins/hoster/LomafileCom.py
pyload/plugins/hoster/MegaFilesSe.py
pyload/plugins/hoster/MegareleaseOrg.py
pyload/plugins/hoster/PandaPlanet.py
pyload/plugins/hoster/PotloadCom.py
pyload/plugins/hoster/PremiumTo.py
pyload/plugins/hoster/TurbobitNet.py
pyload/plugins/internal/DeadCrypter.py
pyload/plugins/internal/DeadHoster.py
pyload/plugins/internal/SimpleCrypter.py
pyload/plugins/internal/UpdateManager.py
pyload/plugins/ocr/LinksaveIn.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 cc9cf16d3..00d95366c 100644 --- a/pyload/plugins/hoster/TurbobitNet.py +++ b/pyload/plugins/hoster/TurbobitNet.py @@ -22,8 +22,8 @@ class TurbobitNet(SimpleHoster): __pattern__ = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)' __description__ = """Turbobit.net hoster plugin""" - __author_name__ = ("zoidberg", "prOq") - __author_mail__ = ("zoidberg@mujmail.cz", None) + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("prOq", None)] FILE_NAME_PATTERN = r'id="file-title">(?P<N>.+?)<' |