From 9327b55e147d95b5865f23788f980c7268ea03e3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 20 Apr 2015 21:38:42 +0200 Subject: Spare code cosmetics (7) --- pyload/plugin/account/CloudzillaTo.py | 2 +- pyload/plugin/account/Keep2ShareCc.py | 2 +- pyload/plugin/account/MegasharesCom.py | 2 +- pyload/plugin/account/MultishareCz.py | 2 +- pyload/plugin/account/QuickshareCz.py | 2 +- pyload/plugin/account/UlozTo.py | 2 +- pyload/plugin/account/UploadedTo.py | 2 +- pyload/plugin/account/UploadingCom.py | 2 +- pyload/plugin/account/YibaishiwuCom.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'pyload/plugin/account') diff --git a/pyload/plugin/account/CloudzillaTo.py b/pyload/plugin/account/CloudzillaTo.py index af3544da9..bee7c5a17 100644 --- a/pyload/plugin/account/CloudzillaTo.py +++ b/pyload/plugin/account/CloudzillaTo.py @@ -21,7 +21,7 @@ class CloudzillaTo(Account): def loadAccountInfo(self, user, req): html = req.load("http://www.cloudzilla.to/") - premium = True if re.search(self.PREMIUM_PATTERN, html) else False + premium = re.search(self.PREMIUM_PATTERN, html) is not None return {'validuntil': -1, 'trafficleft': -1, 'premium': premium} diff --git a/pyload/plugin/account/Keep2ShareCc.py b/pyload/plugin/account/Keep2ShareCc.py index 6ee45c256..56ac5e9ab 100644 --- a/pyload/plugin/account/Keep2ShareCc.py +++ b/pyload/plugin/account/Keep2ShareCc.py @@ -46,7 +46,7 @@ class Keep2ShareCc(Account): self.logError(e) else: - premium = True if validuntil > time.mktime(time.gmtime()) else False + premium = validuntil > time.mktime(time.gmtime()) m = re.search(self.TRAFFIC_LEFT_PATTERN, html) if m: diff --git a/pyload/plugin/account/MegasharesCom.py b/pyload/plugin/account/MegasharesCom.py index 42ecfc17d..593583a0e 100644 --- a/pyload/plugin/account/MegasharesCom.py +++ b/pyload/plugin/account/MegasharesCom.py @@ -23,7 +23,7 @@ class MegasharesCom(Account): #self.relogin(user) html = req.load("http://d01.megashares.com/myms.php", decode=True) - premium = False if '>Premium Upgrade<' in html else True + premium = '>Premium Upgrade<' not in html validuntil = trafficleft = -1 try: diff --git a/pyload/plugin/account/MultishareCz.py b/pyload/plugin/account/MultishareCz.py index b743fd28a..6d41a2b18 100644 --- a/pyload/plugin/account/MultishareCz.py +++ b/pyload/plugin/account/MultishareCz.py @@ -25,7 +25,7 @@ class MultishareCz(Account): m = re.search(self.TRAFFIC_LEFT_PATTERN, html) trafficleft = self.parseTraffic(m.group('S') + m.group('U')) if m else 0 - self.premium = True if trafficleft else False + self.premium = bool(trafficleft) html = req.load("http://www.multishare.cz/", decode=True) mms_info = dict(re.findall(self.ACCOUNT_INFO_PATTERN, html)) diff --git a/pyload/plugin/account/QuickshareCz.py b/pyload/plugin/account/QuickshareCz.py index 67dd11ac3..2f71d9ae8 100644 --- a/pyload/plugin/account/QuickshareCz.py +++ b/pyload/plugin/account/QuickshareCz.py @@ -24,7 +24,7 @@ class QuickshareCz(Account): m = re.search(self.TRAFFIC_LEFT_PATTERN, html) if m: trafficleft = self.parseTraffic(m.group(1)) - premium = True if trafficleft else False + premium = bool(trafficleft) else: trafficleft = None premium = False diff --git a/pyload/plugin/account/UlozTo.py b/pyload/plugin/account/UlozTo.py index 34e56d325..c43246e7d 100644 --- a/pyload/plugin/account/UlozTo.py +++ b/pyload/plugin/account/UlozTo.py @@ -27,7 +27,7 @@ class UlozTo(Account): m = re.search(self.TRAFFIC_LEFT_PATTERN, html) trafficleft = float(m.group(1).replace(' ', '').replace(',', '.')) * 1000 * 1.048 if m else 0 - premium = True if trafficleft else False + premium = bool(trafficleft) return {'validuntil': -1, 'trafficleft': trafficleft, 'premium': premium} diff --git a/pyload/plugin/account/UploadedTo.py b/pyload/plugin/account/UploadedTo.py index 61765faf8..1b8ae5b27 100644 --- a/pyload/plugin/account/UploadedTo.py +++ b/pyload/plugin/account/UploadedTo.py @@ -28,7 +28,7 @@ class UploadedTo(Account): html = req.load("http://uploaded.net/me") - premium = True if re.search(self.PREMIUM_PATTERN, html) else False + premium = re.search(self.PREMIUM_PATTERN, html) is not None m = re.search(self.VALID_UNTIL_PATTERN, html, re.M) if m: diff --git a/pyload/plugin/account/UploadingCom.py b/pyload/plugin/account/UploadingCom.py index f5333dd4c..992e63615 100644 --- a/pyload/plugin/account/UploadingCom.py +++ b/pyload/plugin/account/UploadingCom.py @@ -28,7 +28,7 @@ class UploadingCom(Account): html = req.load("http://uploading.com/") - premium = False if re.search(self.PREMIUM_PATTERN, html) else True + premium = re.search(self.PREMIUM_PATTERN, html) is None m = re.search(self.VALID_UNTIL_PATTERN, html) if m: diff --git a/pyload/plugin/account/YibaishiwuCom.py b/pyload/plugin/account/YibaishiwuCom.py index ad9b089a9..0a15c29de 100644 --- a/pyload/plugin/account/YibaishiwuCom.py +++ b/pyload/plugin/account/YibaishiwuCom.py @@ -23,7 +23,7 @@ class YibaishiwuCom(Account): html = req.load("http://115.com/", decode=True) m = re.search(self.ACCOUNT_INFO_PATTERN, html, re.S) - premium = True if m and 'is_vip: 1' in m.group(1) else False + premium = m and 'is_vip: 1' in m.group(1) validuntil = trafficleft = (-1 if m else 0) return dict({"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}) -- cgit v1.2.3 From 5a86c3cb1db6cd87bf9ae22e09dd209cecc0a363 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 20 Apr 2015 22:48:30 +0200 Subject: Spare code cosmetics (8) --- pyload/plugin/account/AlldebridCom.py | 4 ++-- pyload/plugin/account/FileserveCom.py | 2 +- pyload/plugin/account/HellshareCz.py | 6 +++--- pyload/plugin/account/MegaRapidoNet.py | 2 +- pyload/plugin/account/MegasharesCom.py | 2 +- pyload/plugin/account/MultishareCz.py | 2 +- pyload/plugin/account/RPNetBiz.py | 2 +- pyload/plugin/account/YibaishiwuCom.py | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'pyload/plugin/account') diff --git a/pyload/plugin/account/AlldebridCom.py b/pyload/plugin/account/AlldebridCom.py index e3eb01ac2..efc5753f8 100644 --- a/pyload/plugin/account/AlldebridCom.py +++ b/pyload/plugin/account/AlldebridCom.py @@ -24,7 +24,7 @@ class AlldebridCom(Account): html = req.load("http://www.alldebrid.com/account/") soup = BeautifulSoup(html) - #Try to parse expiration date directly from the control panel page (better accuracy) + # Try to parse expiration date directly from the control panel page (better accuracy) try: time_text = soup.find('div', attrs={'class': 'remaining_time_text'}).strong.string @@ -35,7 +35,7 @@ class AlldebridCom(Account): exp_time = time.time() + int(exp_data[0]) * 24 * 60 * 60 + int( exp_data[1]) * 60 * 60 + (int(exp_data[2]) - 1) * 60 - #Get expiration date from API + # Get expiration date from API except Exception: data = self.getAccountData(user) html = req.load("http://www.alldebrid.com/api.php", diff --git a/pyload/plugin/account/FileserveCom.py b/pyload/plugin/account/FileserveCom.py index 46cb3cbad..d68285a33 100644 --- a/pyload/plugin/account/FileserveCom.py +++ b/pyload/plugin/account/FileserveCom.py @@ -38,7 +38,7 @@ class FileserveCom(Account): if not res['type']: self.wrongPassword() - #login at fileserv html + # login at fileserv html req.load("http://www.fileserve.com/login.php", post={"loginUserName": user, "loginUserPassword": data['password'], "autoLogin": "checked", "loginFormSubmit": "Login"}) diff --git a/pyload/plugin/account/HellshareCz.py b/pyload/plugin/account/HellshareCz.py index 444677c88..68843ee80 100644 --- a/pyload/plugin/account/HellshareCz.py +++ b/pyload/plugin/account/HellshareCz.py @@ -33,14 +33,14 @@ class HellshareCz(Account): premium = True try: if "." in credit: - #Time-based account + # Time-based account vt = [int(x) for x in credit.split('.')[:2]] lt = time.localtime() year = lt.tm_year + int(vt[1] < lt.tm_mon or (vt[1] == lt.tm_mon and vt[0] < lt.tm_mday)) validuntil = time.mktime(time.strptime("%s%d 23:59:59" % (credit, year), "%d.%m.%Y %H:%M:%S")) trafficleft = -1 else: - #Traffic-based account + # Traffic-based account trafficleft = self.parseTraffic(credit + "MB") validuntil = -1 except Exception, e: @@ -54,7 +54,7 @@ class HellshareCz(Account): def login(self, user, data, req): html = req.load('http://www.hellshare.com/', decode=True) if req.lastEffectiveURL != 'http://www.hellshare.com/': - #Switch to English + # Switch to English self.logDebug("Switch lang - URL: %s" % req.lastEffectiveURL) json = req.load("%s?do=locRouter-show" % req.lastEffectiveURL) diff --git a/pyload/plugin/account/MegaRapidoNet.py b/pyload/plugin/account/MegaRapidoNet.py index 2bffff288..c4ee559da 100644 --- a/pyload/plugin/account/MegaRapidoNet.py +++ b/pyload/plugin/account/MegaRapidoNet.py @@ -29,7 +29,7 @@ class MegaRapidoNet(Account): validuntil = re.search(self.VALID_UNTIL_PATTERN, html) if validuntil: - #hier weitermachen!!! (müssen umbedingt die zeit richtig machen damit! (sollte aber möglich)) + # hier weitermachen!!! (müssen umbedingt die zeit richtig machen damit! (sollte aber möglich)) validuntil = time.time() + int(validuntil.group(1)) * 24 * 3600 + int(validuntil.group(2)) * 3600 + int(validuntil.group(3)) * 60 + int(validuntil.group(4)) trafficleft = -1 premium = True diff --git a/pyload/plugin/account/MegasharesCom.py b/pyload/plugin/account/MegasharesCom.py index 593583a0e..8920bb2db 100644 --- a/pyload/plugin/account/MegasharesCom.py +++ b/pyload/plugin/account/MegasharesCom.py @@ -20,7 +20,7 @@ class MegasharesCom(Account): def loadAccountInfo(self, user, req): - #self.relogin(user) + # self.relogin(user) html = req.load("http://d01.megashares.com/myms.php", decode=True) premium = '>Premium Upgrade<' not in html diff --git a/pyload/plugin/account/MultishareCz.py b/pyload/plugin/account/MultishareCz.py index 6d41a2b18..66ab3dd47 100644 --- a/pyload/plugin/account/MultishareCz.py +++ b/pyload/plugin/account/MultishareCz.py @@ -20,7 +20,7 @@ class MultishareCz(Account): def loadAccountInfo(self, user, req): - #self.relogin(user) + # self.relogin(user) html = req.load("http://www.multishare.cz/profil/", decode=True) m = re.search(self.TRAFFIC_LEFT_PATTERN, html) diff --git a/pyload/plugin/account/RPNetBiz.py b/pyload/plugin/account/RPNetBiz.py index 2dfce536b..562436e85 100644 --- a/pyload/plugin/account/RPNetBiz.py +++ b/pyload/plugin/account/RPNetBiz.py @@ -26,7 +26,7 @@ class RPNetBiz(Account): account_info = {"validuntil": None, "trafficleft": None, "premium": False} except KeyError: - #handle wrong password exception + # handle wrong password exception account_info = {"validuntil": None, "trafficleft": None, "premium": False} return account_info diff --git a/pyload/plugin/account/YibaishiwuCom.py b/pyload/plugin/account/YibaishiwuCom.py index 0a15c29de..e12e3f3f2 100644 --- a/pyload/plugin/account/YibaishiwuCom.py +++ b/pyload/plugin/account/YibaishiwuCom.py @@ -19,7 +19,7 @@ class YibaishiwuCom(Account): def loadAccountInfo(self, user, req): - #self.relogin(user) + # self.relogin(user) html = req.load("http://115.com/", decode=True) m = re.search(self.ACCOUNT_INFO_PATTERN, html, re.S) -- cgit v1.2.3 From 892b7cbd4981b764bed30b2ccc5ca73d791c39f2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 20 Apr 2015 22:56:34 +0200 Subject: Spare code cosmetics (9) --- pyload/plugin/account/FastshareCz.py | 2 +- pyload/plugin/account/FilecloudIo.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pyload/plugin/account') diff --git a/pyload/plugin/account/FastshareCz.py b/pyload/plugin/account/FastshareCz.py index 518746710..f1ed9d634 100644 --- a/pyload/plugin/account/FastshareCz.py +++ b/pyload/plugin/account/FastshareCz.py @@ -41,7 +41,7 @@ class FastshareCz(Account): def login(self, user, data, req): req.cj.setCookie("fastshare.cz", "lang", "en") - req.load('http://www.fastshare.cz/login') # Do not remove or it will not login + req.load('http://www.fastshare.cz/login') #: Do not remove or it will not login html = req.load("http://www.fastshare.cz/sql.php", post={'login': user, 'heslo': data['password']}, diff --git a/pyload/plugin/account/FilecloudIo.py b/pyload/plugin/account/FilecloudIo.py index 12e2d44f5..b07fe981a 100644 --- a/pyload/plugin/account/FilecloudIo.py +++ b/pyload/plugin/account/FilecloudIo.py @@ -30,7 +30,7 @@ class FilecloudIo(Account): return {"premium": False} akey = rep['akey'] - self.accounts[user]['akey'] = akey # Saved for hoster plugin + self.accounts[user]['akey'] = akey #: Saved for hoster plugin rep = req.load("http://api.filecloud.io/api-fetch_account_details.api", post={"akey": akey}) rep = json_loads(rep) -- cgit v1.2.3