From f5535809bebc6cc343475704832c8fd8674d2d06 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 --- module/plugins/accounts/WarserverCz.py | 44 ++++++++++++++++------------------ 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'module/plugins/accounts/WarserverCz.py') diff --git a/module/plugins/accounts/WarserverCz.py b/module/plugins/accounts/WarserverCz.py index 21961956b..2c871eb6d 100644 --- a/module/plugins/accounts/WarserverCz.py +++ b/module/plugins/accounts/WarserverCz.py @@ -17,10 +17,11 @@ @author: zoidberg """ -from module.plugins.Account import Account import re + +from module.plugins.Account import Account from module.utils import parseFileSize -from time import mktime, strptime + class WarserverCz(Account): __name__ = "WarserverCz" @@ -29,42 +30,39 @@ class WarserverCz(Account): __description__ = """Warserver.cz account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + VALID_UNTIL_PATTERN = ur'
  • Neomezené stahování do: (.+?)<' TRAFFIC_LEFT_PATTERN = ur'
  • Kredit: (.+?)<' - + DOMAIN = "http://www.warserver.cz" - def loadAccountInfo(self, user, req): - html = req.load("%s/uzivatele/prehled" % self.DOMAIN, decode = True) - + def loadAccountInfo(self, user, req): + html = req.load("%s/uzivatele/prehled" % self.DOMAIN, decode=True) + validuntil = trafficleft = None premium = False - + found = re.search(self.VALID_UNTIL_PATTERN, html) if found: self.logDebug("VALID_UNTIL", found.group(1)) - try: + try: #validuntil = mktime(strptime(found.group(1), "%d %B %Y")) premium = True trafficleft = -1 except Exception, e: self.logError(e) - + found = re.search(self.TRAFFIC_LEFT_PATTERN, html) if found: self.logDebug("TRAFFIC_LEFT", found.group(1)) - trafficleft = parseFileSize((found.group(1).replace(" ",""))) // 1024 - premium = True if trafficleft > 1 << 18 else False - - return ({"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}) - + trafficleft = parseFileSize((found.group(1).replace(" ", ""))) // 1024 + premium = True if trafficleft > 1 << 18 else False + + return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium} + def login(self, user, data, req): - html = req.load('%s/uzivatele/prihlaseni?do=prihlaseni-submit' % self.DOMAIN, - post = {"username": user, - "password": data['password'], - "send": u"Přihlásit"}, - decode = True) - - if '

    ' in html: - self.wrongPassword() \ No newline at end of file + html = req.load('%s/uzivatele/prihlaseni?do=prihlaseni-submit' % self.DOMAIN, + post={"username": user, "password": data['password'], "send": u"Přihlásit"}, decode=True) + + if '

    ' in html: + self.wrongPassword() -- cgit v1.2.3