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/RapideoPl.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/RapideoPl.py')
-rw-r--r-- | module/plugins/accounts/RapideoPl.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/module/plugins/accounts/RapideoPl.py b/module/plugins/accounts/RapideoPl.py index e9a483927..4585bc718 100644 --- a/module/plugins/accounts/RapideoPl.py +++ b/module/plugins/accounts/RapideoPl.py @@ -11,7 +11,7 @@ from module.plugins.internal.Account import Account class RapideoPl(Account): __name__ = "RapideoPl" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = "Rapideo.pl account plugin" @@ -32,10 +32,11 @@ class RapideoPl(Account): _pwd = None - def parse_info(self, user, password, data, req): + def grab_info(self, user, password, data, req): self._req = req try: result = json_loads(self.run_auth_query()) + except Exception: #@TODO: return or let it be thrown? return @@ -61,11 +62,12 @@ class RapideoPl(Account): try: response = json_loads(self.run_auth_query()) + except Exception: - self.login_fail() + self.fail_login() if "errno" in response.keys(): - self.login_fail() + self.fail_login() data['usr'] = self._usr data['pwd'] = self._pwd |