diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-10-27 01:18:45 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-10-27 01:18:45 +0100 |
| commit | 146fe1e309c33ab149bfaf58ad86c0dd4fb9b156 (patch) | |
| tree | 22bf2ace19d926392dbe7ba48e44c13c63cd368a /module/plugins/accounts | |
| parent | [SimpleHoster] Direct download link support (diff) | |
| download | pyload-146fe1e309c33ab149bfaf58ad86c0dd4fb9b156.tar.xz | |
Spare code cosmetics
Diffstat (limited to 'module/plugins/accounts')
| -rw-r--r-- | module/plugins/accounts/HellshareCz.py | 2 | ||||
| -rw-r--r-- | module/plugins/accounts/MegaRapidCz.py | 2 | ||||
| -rw-r--r-- | module/plugins/accounts/QuickshareCz.py | 4 | ||||
| -rw-r--r-- | module/plugins/accounts/UploadedTo.py | 5 |
4 files changed, 6 insertions, 7 deletions
diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py index 15e25a7dd..cbe6b9654 100644 --- a/module/plugins/accounts/HellshareCz.py +++ b/module/plugins/accounts/HellshareCz.py @@ -44,7 +44,7 @@ class HellshareCz(Account): trafficleft = int(credit) * 1024 validuntil = -1 except Exception, e: - self.logError(_("Unable to parse credit info"), repr(e)) + self.logError(_("Unable to parse credit info"), str(e)) validuntil = -1 trafficleft = -1 diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py index 04abf8c8a..c458210f8 100644 --- a/module/plugins/accounts/MegaRapidCz.py +++ b/module/plugins/accounts/MegaRapidCz.py @@ -18,7 +18,7 @@ class MegaRapidCz(Account): login_timeout = 60 - + LIMITDL_PATTERN = ur'<td>Max. počet paralelních stahování: </td><td>(\d+)' VALID_UNTIL_PATTERN = ur'<td>Paušální stahování aktivní. Vyprší </td><td><strong>(.*?)</strong>' TRAFFIC_LEFT_PATTERN = r'<tr><td>Kredit</td><td>(.*?) GiB' diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py index f8ba3e7ff..e01058644 100644 --- a/module/plugins/accounts/QuickshareCz.py +++ b/module/plugins/accounts/QuickshareCz.py @@ -16,8 +16,8 @@ class QuickshareCz(Account): TRAFFIC_LEFT_PATTERN = r'Stav kreditu: <strong>(.+?)</strong>' - - + + def loadAccountInfo(self, user, req): html = req.load("http://www.quickshare.cz/premium", decode=True) diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 55017eb30..8a4e14665 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -31,11 +31,10 @@ class UploadedTo(Account): if raw_valid == "unlimited": validuntil = -1 else: - raw_valid = re.findall(r"(\d+) (Week|weeks|days|day|hours|hour)", raw_valid) + raw_valid = re.findall(r"(\d+) (Week|weeks|day|hour)", raw_valid) validuntil = time() for n, u in raw_valid: - validuntil += int(n) * 60 * 60 * {"Week": 168, "weeks": 168, "days": 24, - "day": 24, "hours": 1, "hour": 1}[u] + validuntil += int(n) * 60 * 60 * {"Week": 168, "weeks": 168, "day": 24, "hour": 1}[u] return {"validuntil": validuntil, "trafficleft": traffic, "maxtraffic": 50 * 1024 * 1024} else: |