summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/account/YibaishiwuCom.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-10-07 19:54:24 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-10-07 19:54:24 +0200
commitbe459e0b409dcd5e04edd75be374bd35d4018e9a (patch)
tree3f73e813d20608ff0d23eada8214a5124c85bff5 /pyload/plugins/account/YibaishiwuCom.py
parentMerge branch 'stable' into 0.4.10 (diff)
parentNew __authors__ key replaces __author_name__ and __author_mail__ + Whitespace... (diff)
downloadpyload-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/account/YibaishiwuCom.py')
-rw-r--r--pyload/plugins/account/YibaishiwuCom.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyload/plugins/account/YibaishiwuCom.py b/pyload/plugins/account/YibaishiwuCom.py
index 6cb595d06..e9fe0facf 100644
--- a/pyload/plugins/account/YibaishiwuCom.py
+++ b/pyload/plugins/account/YibaishiwuCom.py
@@ -11,8 +11,8 @@ class YibaishiwuCom(Account):
__version__ = "0.01"
__description__ = """115.com account plugin"""
- __author_name__ = "zoidberg"
- __author_mail__ = "zoidberg@mujmail.cz"
+ __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
ACCOUNT_INFO_PATTERN = r'var USER_PERMISSION = {(.*?)}'