From 4a81799278ae003bfbd7897f7bcd1ef46642d953 Mon Sep 17 00:00:00 2001 From: Stefano Date: Tue, 23 Jul 2013 20:22:42 +0200 Subject: Fixed PEP 8 violations in Accounts (cherry picked from commit f5535809bebc6cc343475704832c8fd8674d2d06) Conflicts: pyload/plugins/accounts/AlldebridCom.py pyload/plugins/accounts/Premium4Me.py pyload/plugins/accounts/PremiumizeMe.py pyload/plugins/accounts/RealdebridCom.py --- pyload/plugins/accounts/MegasharesCom.py | 34 +++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'pyload/plugins/accounts/MegasharesCom.py') diff --git a/pyload/plugins/accounts/MegasharesCom.py b/pyload/plugins/accounts/MegasharesCom.py index 91601fc95..e7d5f9ca9 100644 --- a/pyload/plugins/accounts/MegasharesCom.py +++ b/pyload/plugins/accounts/MegasharesCom.py @@ -1,9 +1,11 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account import re from time import mktime, strptime +from module.plugins.Account import Account + + class MegasharesCom(Account): __name__ = "MegasharesCom" __version__ = "0.02" @@ -11,32 +13,32 @@ class MegasharesCom(Account): __description__ = """megashares.com account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + VALID_UNTIL_PATTERN = r'

Period Ends: (\w{3} \d{1,2}, \d{4})

' - + def loadAccountInfo(self, user, req): #self.relogin(user) - html = req.load("http://d01.megashares.com/myms.php", decode = True) - + html = req.load("http://d01.megashares.com/myms.php", decode=True) + premium = False if '>Premium Upgrade<' in html else True - + validuntil = trafficleft = -1 - try: + try: timestr = re.search(self.VALID_UNTIL_PATTERN, html).group(1) self.logDebug(timestr) validuntil = mktime(strptime(timestr, "%b %d, %Y")) except Exception, e: - self.logError(e) - + self.logError(e) + return {"validuntil": validuntil, "trafficleft": -1, "premium": premium} - + def login(self, user, data, req): - html = req.load('http://d01.megashares.com/myms_login.php', post = { - "httpref": "", - "myms_login": "Login", + html = req.load('http://d01.megashares.com/myms_login.php', post={ + "httpref": "", + "myms_login": "Login", "mymslogin_name": user, "mymspassword": data['password'] - }, decode = True) - + }, decode=True) + if not '%s' % user in html: - self.wrongPassword() \ No newline at end of file + self.wrongPassword() -- cgit v1.2.3