summaryrefslogtreecommitdiffstats
path: root/module/plugins/accounts/WebshareCz.py
diff options
context:
space:
mode:
authorGravatar Jochen Oberreiter <joberreiter@users.noreply.github.com> 2015-09-26 18:24:29 +0200
committerGravatar Jochen Oberreiter <joberreiter@users.noreply.github.com> 2015-09-26 18:24:29 +0200
commit93a0c1d930520c055eae766b5dad305111a02c4d (patch)
tree8ac3f9e6dcf682775f5b170f2a9ca40eb7c0f8fc /module/plugins/accounts/WebshareCz.py
parentSpare plugin updates (diff)
parentMerge pull request #1850 from chaosblog/patch-2 (diff)
downloadpyload-93a0c1d930520c055eae766b5dad305111a02c4d.tar.xz
Merge pull request #1 from pyload/stable
Merge actual version
Diffstat (limited to 'module/plugins/accounts/WebshareCz.py')
-rw-r--r--module/plugins/accounts/WebshareCz.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/module/plugins/accounts/WebshareCz.py b/module/plugins/accounts/WebshareCz.py
index bbfb90a92..33f851263 100644
--- a/module/plugins/accounts/WebshareCz.py
+++ b/module/plugins/accounts/WebshareCz.py
@@ -12,7 +12,7 @@ from module.plugins.internal.Account import Account
class WebshareCz(Account):
__name__ = "WebshareCz"
__type__ = "account"
- __version__ = "0.10"
+ __version__ = "0.11"
__status__ = "testing"
__description__ = """Webshare.cz account plugin"""
@@ -25,7 +25,7 @@ class WebshareCz(Account):
TRAFFIC_LEFT_PATTERN = r'<bytes>(.+)</bytes>'
- def parse_info(self, user, password, data, req):
+ def grab_info(self, user, password, data, req):
html = self.load("https://webshare.cz/api/user_data/",
post={'wst': self.get_data(user).get('wst', None)})
@@ -47,7 +47,7 @@ class WebshareCz(Account):
'wst' : ""})
if "<status>OK</status>" not in salt:
- self.login_fail()
+ self.fail_login()
salt = re.search('<salt>(.+)</salt>', salt).group(1)
password = hashlib.sha1(md5_crypt.encrypt(password, salt=salt)).hexdigest()
@@ -61,6 +61,6 @@ class WebshareCz(Account):
'wst' : ""})
if "<status>OK</status>" not in login:
- self.login_fail()
+ self.fail_login()
data['wst'] = re.search('<token>(.+)</token>', login).group(1)