diff options
| author |  Jochen Oberreiter <joberreiter@users.noreply.github.com>
| 2015-09-26 18:24:29 +0200 |
|---|---|---|
| committer | Jochen Oberreiter <joberreiter@users.noreply.github.com>
| 2015-09-26 18:24:29 +0200 |
| commit | 93a0c1d930520c055eae766b5dad305111a02c4d (patch) | |
| tree | 8ac3f9e6dcf682775f5b170f2a9ca40eb7c0f8fc /module/plugins/accounts/OboomCom.py | |
| parent | Spare plugin updates (diff) | |
| parent | Merge pull request #1850 from chaosblog/patch-2 (diff) | |
| download | pyload-93a0c1d930520c055eae766b5dad305111a02c4d.tar.xz | |
Merge pull request #1 from pyload/stable
Merge actual version
Diffstat (limited to 'module/plugins/accounts/OboomCom.py')
| -rw-r--r-- | module/plugins/accounts/OboomCom.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py index 380368b70..abb223e65 100644 --- a/module/plugins/accounts/OboomCom.py +++ b/module/plugins/accounts/OboomCom.py @@ -23,7 +23,7 @@ from module.plugins.internal.Account import Account class OboomCom(Account): __name__ = "OboomCom" __type__ = "account" - __version__ = "0.27" + __version__ = "0.28" __status__ = "testing" __description__ = """Oboom.com account plugin""" @@ -40,22 +40,19 @@ class OboomCom(Account): get={'auth': user, 'pass': pbkdf2})) - if not result[0] == 200: + if result[0] != 200: self.log_warning(_("Failed to log in: %s") % result[1]) - self.login_fail() + self.fail_login() return result[1] - def parse_info(self, name, req): + def grab_info(self, name, req): account_data = self.load_account_data(name, req) userData = account_data['user'] - if userData['premium'] == "null": - premium = False - else: - premium = True + premium = userData['premium'] != "null" if userData['premium_unix'] == "null": validUntil = -1 @@ -65,7 +62,7 @@ class OboomCom(Account): traffic = userData['traffic'] trafficLeft = traffic['current'] / 1024 #@TODO: Remove `/ 1024` in 0.4.10 - maxTraffic = traffic['max'] / 1024 #@TODO: Remove `/ 1024` in 0.4.10 + maxTraffic = traffic['max'] / 1024 #@TODO: Remove `/ 1024` in 0.4.10 session = account_data['session'] |