diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-07-17 15:29:48 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-07-17 15:29:48 +0200 |
| commit | 1f5a55ae2133a782bdcca334ecbcdbde50dbcf99 (patch) | |
| tree | 820ddb376ea97d4cf3aa53ef0f4dfb4ebfa4a0d5 /module/plugins/accounts | |
| parent | Spare fixes and code cosmetics (diff) | |
| download | pyload-1f5a55ae2133a782bdcca334ecbcdbde50dbcf99.tar.xz | |
No more need to use the req argument when call load method
Diffstat (limited to 'module/plugins/accounts')
55 files changed, 118 insertions, 186 deletions
diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py index f73c3e0fd..903499d5b 100644 --- a/module/plugins/accounts/AlldebridCom.py +++ b/module/plugins/accounts/AlldebridCom.py @@ -21,7 +21,7 @@ class AlldebridCom(Account): def load_account_info(self, user, req): data = self.get_account_data(user) - html = self.load("http://www.alldebrid.com/account/", req=req) + html = self.load("http://www.alldebrid.com/account/") soup = BeautifulSoup(html) # Try to parse expiration date directly from the control panel page (better accuracy) @@ -41,8 +41,7 @@ class AlldebridCom(Account): html = self.load("https://www.alldebrid.com/api.php", get={'action': "info_user", 'login' : user, - 'pw' : data['password']}, - req=req) + 'pw' : data['password']}) self.log_debug(html) @@ -58,8 +57,7 @@ class AlldebridCom(Account): html = self.load("https://www.alldebrid.com/register/", get={'action' : "login", 'login_login' : user, - 'login_password': data['password']}, - req=req) + 'login_password': data['password']}) if "This login doesn't exist" in html \ or "The password is not valid" in html \ diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py index e71812891..c47ec9d77 100644 --- a/module/plugins/accounts/BitshareCom.py +++ b/module/plugins/accounts/BitshareCom.py @@ -14,7 +14,7 @@ class BitshareCom(Account): def load_account_info(self, user, req): - html = self.load("http://bitshare.com/mysettings.html", req=req) + html = self.load("http://bitshare.com/mysettings.html") if "\"http://bitshare.com/myupgrade.html\">Free" in html: return {"validuntil": -1, "trafficleft": -1, "premium": False} @@ -29,8 +29,7 @@ class BitshareCom(Account): html = self.load("https://bitshare.com/login.html", post={"user" : user, "password": data['password'], - "submit" : "Login"}, - req=req) + "submit" : "Login"}) if "login" in req.lastEffectiveURL: self.wrong_password() diff --git a/module/plugins/accounts/CatShareNet.py b/module/plugins/accounts/CatShareNet.py index 1a7355095..da0eec4f0 100644 --- a/module/plugins/accounts/CatShareNet.py +++ b/module/plugins/accounts/CatShareNet.py @@ -26,7 +26,7 @@ class CatShareNet(Account): validuntil = -1 trafficleft = -1 - html = self.load("http://catshare.net/", req=req) + html = self.load("http://catshare.net/") if re.search(self.PREMIUM_PATTERN, html): premium = True @@ -54,8 +54,7 @@ class CatShareNet(Account): post={'user_email' : user, 'user_password' : data['password'], 'remindPassword': 0, - 'user[submit]' : "Login"}, - req=req) + 'user[submit]' : "Login"}) if not '<a href="/logout">Wyloguj</a>' in html: self.wrong_password() diff --git a/module/plugins/accounts/CloudzillaTo.py b/module/plugins/accounts/CloudzillaTo.py index 2677a5b55..7c0ac66b8 100644 --- a/module/plugins/accounts/CloudzillaTo.py +++ b/module/plugins/accounts/CloudzillaTo.py @@ -19,7 +19,7 @@ class CloudzillaTo(Account): def load_account_info(self, user, req): - html = self.load("http://www.cloudzilla.to/", req=req) + html = self.load("http://www.cloudzilla.to/") premium = True if re.search(self.PREMIUM_PATTERN, html) else False @@ -30,8 +30,7 @@ class CloudzillaTo(Account): html = self.load("https://www.cloudzilla.to/", post={'lusername': user, 'lpassword': data['password'], - 'w' : "dologin"}, - req=req) + 'w' : "dologin"}) if "ERROR" in html: self.wrong_password() diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py index 6212ffafd..4b1bb14cb 100644 --- a/module/plugins/accounts/CzshareCom.py +++ b/module/plugins/accounts/CzshareCom.py @@ -25,7 +25,7 @@ class CzshareCom(Account): validuntil = None trafficleft = None - html = self.load("http://sdilej.cz/prehled_kreditu/", req=req) + html = self.load("http://sdilej.cz/prehled_kreditu/") try: m = re.search(self.CREDIT_LEFT_PATTERN, html) @@ -47,8 +47,7 @@ class CzshareCom(Account): html = self.load('https://sdilej.cz/index.php', post={"Prihlasit" : "Prihlasit", "login-password": data['password'], - "login-name" : user}, - req=req) + "login-name" : user}) if '<div class="login' in html: self.wrong_password() diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py index 0fde5c6ca..4b4b498b7 100644 --- a/module/plugins/accounts/DebridItaliaCom.py +++ b/module/plugins/accounts/DebridItaliaCom.py @@ -22,7 +22,7 @@ class DebridItaliaCom(Account): def load_account_info(self, user, req): info = {"premium": False, "validuntil": None, "trafficleft": None} - html = self.load("http://debriditalia.com/", req=req) + html = self.load("http://debriditalia.com/") if 'Account premium not activated' not in html: m = re.search(self.WALID_UNTIL_PATTERN, html) @@ -38,8 +38,7 @@ class DebridItaliaCom(Account): def login(self, user, data, req): html = self.load("https://debriditalia.com/login.php", get={'u': user, - 'p': data['password']}, - req=req) + 'p': data['password']}) if 'NO' in html: self.wrong_password() diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py index ce2dc1923..7c60682c0 100644 --- a/module/plugins/accounts/DepositfilesCom.py +++ b/module/plugins/accounts/DepositfilesCom.py @@ -19,7 +19,7 @@ class DepositfilesCom(Account): def load_account_info(self, user, req): - html = self.load("https://dfiles.eu/de/gold/", req=req) + html = self.load("https://dfiles.eu/de/gold/") validuntil = re.search(r"Sie haben Gold Zugang bis: <b>(.*?)</b></div>", html).group(1) validuntil = time.mktime(time.strptime(validuntil, "%Y-%m-%d %H:%M:%S")) @@ -31,8 +31,7 @@ class DepositfilesCom(Account): html = self.load("https://dfiles.eu/de/login.php", get={"return": "/de/gold/payment.php"}, post={"login" : user, - "password": data['password']}, - req=req) + "password": data['password']}) if r'<div class="error_message">Sie haben eine falsche Benutzername-Passwort-Kombination verwendet.</div>' in html: self.wrong_password() diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py index 5d909b789..6317ea1b2 100644 --- a/module/plugins/accounts/EuroshareEu.py +++ b/module/plugins/accounts/EuroshareEu.py @@ -18,7 +18,7 @@ class EuroshareEu(Account): def load_account_info(self, user, req): self.relogin(user) - html = self.load("http://euroshare.eu/customer-zone/settings/", req=req) + html = self.load("http://euroshare.eu/customer-zone/settings/") m = re.search('id="input_expire_date" value="(\d+\.\d+\.\d+ \d+:\d+)"', html) if m is None: @@ -35,8 +35,7 @@ class EuroshareEu(Account): html = self.load('http://euroshare.eu/customer-zone/login/', post={"trvale" : "1", "login" : user, - "password": data['password']}, - req=req) + "password": data['password']}) if u">Nesprávne prihlasovacie meno alebo heslo" in html: self.wrong_password() diff --git a/module/plugins/accounts/FastixRu.py b/module/plugins/accounts/FastixRu.py index d8c992bb3..1fe93fb14 100644 --- a/module/plugins/accounts/FastixRu.py +++ b/module/plugins/accounts/FastixRu.py @@ -18,8 +18,7 @@ class FastixRu(Account): data = self.get_account_data(user) html = json_loads(self.load("http://fastix.ru/api_v2/", get={'apikey': data['api'], - 'sub' : "getaccountdetails"}), - req=req) + 'sub' : "getaccountdetails"})) points = html['points'] kb = float(points) * 1024 ** 2 / 1000 @@ -35,8 +34,7 @@ class FastixRu(Account): html = self.load("https://fastix.ru/api_v2/", get={'sub' : "get_apikey", 'email' : user, - 'password': data['password']}, - req=req) + 'password': data['password']}) api = json_loads(html) api = api['apikey'] diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py index e3c8235d6..16dfc1f81 100644 --- a/module/plugins/accounts/FastshareCz.py +++ b/module/plugins/accounts/FastshareCz.py @@ -24,7 +24,7 @@ class FastshareCz(Account): trafficleft = None premium = False - html = self.load("http://www.fastshare.cz/user", req=req) + html = self.load("http://www.fastshare.cz/user") m = re.search(self.CREDIT_PATTERN, html) if m: @@ -40,12 +40,11 @@ class FastshareCz(Account): def login(self, user, data, req): req.cj.setCookie("fastshare.cz", "lang", "en") - self.load('http://www.fastshare.cz/login', req=req) #@NOTE: Do not remove or it will not login + self.load('http://www.fastshare.cz/login') #@NOTE: Do not remove or it will not login html = self.load("https://www.fastshare.cz/sql.php", post={'login': user, - 'heslo': data['password']}, - req=req) + 'heslo': data['password']}) if ">Wrong username or password" in html: self.wrong_password() diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py index 512a7b67d..d8b60ccbc 100644 --- a/module/plugins/accounts/FilecloudIo.py +++ b/module/plugins/accounts/FilecloudIo.py @@ -32,8 +32,7 @@ class FilecloudIo(Account): akey = rep['akey'] self.accounts[user]['akey'] = akey #: Saved for hoster plugin rep = self.load("http://api.filecloud.io/api-fetch_account_details.api", - post={"akey": akey}, - req=req) + post={"akey": akey}) rep = json_loads(rep) if rep['is_premium'] == 1: @@ -44,7 +43,7 @@ class FilecloudIo(Account): def login(self, user, data, req): req.cj.setCookie("secure.filecloud.io", "lang", "en") - html = self.load('https://secure.filecloud.io/user-login.html', req=req) + html = self.load('https://secure.filecloud.io/user-login.html') if not hasattr(self, "form_data"): self.form_data = {} @@ -53,8 +52,7 @@ class FilecloudIo(Account): self.form_data['password'] = data['password'] html = self.load('https://secure.filecloud.io/user-login_p.html', - post=self.form_data, - req=req) + post=self.form_data) if "you have successfully logged in" not in html: self.wrong_password() diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py index 561e56915..e402c8aaa 100644 --- a/module/plugins/accounts/FilefactoryCom.py +++ b/module/plugins/accounts/FilefactoryCom.py @@ -22,7 +22,7 @@ class FilefactoryCom(Account): def load_account_info(self, user, req): - html = self.load("http://www.filefactory.com/account/", req=req) + html = self.load("http://www.filefactory.com/account/") m = re.search(self.VALID_UNTIL_PATTERN, html) if m: @@ -42,8 +42,7 @@ class FilefactoryCom(Account): html = self.load("https://www.filefactory.com/member/signin.php", post={"loginEmail" : user, "loginPassword": data['password'], - "Submit" : "Sign In"}, - req=req) + "Submit" : "Sign In"}) if req.lastEffectiveURL != "http://www.filefactory.com/account/": self.wrong_password() diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py index f5ee5889a..f0ff77ad8 100644 --- a/module/plugins/accounts/FilejungleCom.py +++ b/module/plugins/accounts/FilejungleCom.py @@ -25,7 +25,7 @@ class FilejungleCom(Account): def load_account_info(self, user, req): - html = self.load(self.URL + "dashboard.php", req=req) + html = self.load(self.URL + "dashboard.php") m = re.search(self.TRAFFIC_LEFT_PATTERN, html) if m: premium = True @@ -44,8 +44,7 @@ class FilejungleCom(Account): "loginFormSubmit" : "Login", "recaptcha_challenge_field" : "", "recaptcha_response_field" : "", - "recaptcha_shortencode_field": ""}, - req=req) + "recaptcha_shortencode_field": ""}) if re.search(self.LOGIN_FAILED_PATTERN, html): self.wrong_password() diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py index 192905ebe..ac90c2993 100644 --- a/module/plugins/accounts/FilerNet.py +++ b/module/plugins/accounts/FilerNet.py @@ -23,7 +23,7 @@ class FilerNet(Account): def load_account_info(self, user, req): - html = self.load("https://filer.net/profile", req=req) + html = self.load("https://filer.net/profile") #: Free user if re.search(self.FREE_PATTERN, html): @@ -43,7 +43,7 @@ class FilerNet(Account): def login(self, user, data, req): - html = self.load("https://filer.net/login", req=req) + html = self.load("https://filer.net/login") token = re.search(self.TOKEN_PATTERN, html).group(1) @@ -52,8 +52,7 @@ class FilerNet(Account): "_password" : data['password'], "_remember_me": "on", "_csrf_token" : token, - "_target_path": "https://filer.net/"}, - req=req) + "_target_path": "https://filer.net/"}) if 'Logout' not in html: self.wrong_password() diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py index a8a2a3b46..b1ec45c42 100644 --- a/module/plugins/accounts/FilesMailRu.py +++ b/module/plugins/accounts/FilesMailRu.py @@ -24,8 +24,7 @@ class FilesMailRu(Account): post={"Domain" : domain, "Login" : user, "Password": data['password'], - "Page" : "http://files.mail.ru/"}, - req=req) + "Page" : "http://files.mail.ru/"}) if "Неверное имя пользователя или пароль" in html: self.wrong_password() diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index a5c1b333b..90ddc5fd2 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -22,8 +22,7 @@ class FileserveCom(Account): html = self.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'], - "submit": "Submit+Query"}, - req=req) + "submit": "Submit+Query"}) res = json_loads(html) if res['type'] == "premium": @@ -37,8 +36,7 @@ class FileserveCom(Account): html = self.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'], - "submit" : "Submit+Query"}, - req=req) + "submit" : "Submit+Query"}) res = json_loads(html) if not res['type']: @@ -49,5 +47,4 @@ class FileserveCom(Account): post={"loginUserName": user, "loginUserPassword": data['password'], "autoLogin": "checked", - "loginFormSubmit": "Login"}, - req=req) + "loginFormSubmit": "Login"}) diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py index 25a4b19b8..3d84a84e4 100644 --- a/module/plugins/accounts/FourSharedCom.py +++ b/module/plugins/accounts/FourSharedCom.py @@ -27,8 +27,7 @@ class FourSharedCom(Account): 'password' : data['password'], 'remember' : "on", '_remember': "on", - 'returnTo' : "http://www.4shared.com/account/home.jsp"}, - req=req) + 'returnTo' : "http://www.4shared.com/account/home.jsp"}) if 'Please log in to access your 4shared account' in res: self.wrong_password() diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index c19ea7177..a06176a55 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -21,7 +21,7 @@ class FreakshareCom(Account): validuntil = None trafficleft = None - html = self.load("http://freakshare.com/", req=req) + html = self.load("http://freakshare.com/") try: m = re.search(r'ltig bis:</td>\s*<td><b>([\d.:-]+)</b></td>', html, re.M) @@ -41,13 +41,12 @@ class FreakshareCom(Account): def login(self, user, data, req): - self.load("http://freakshare.com/index.php?language=EN", req=req) + self.load("http://freakshare.com/index.php?language=EN") html = self.load("https://freakshare.com/login.html", post={"submit": "Login", "user" : user, - "pass" : data['password']}, - req=req) + "pass" : data['password']}) if ">Wrong Username or Password" in html: self.wrong_password() diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index f0891af9e..aefc76e41 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -24,7 +24,7 @@ class FshareVn(Account): def load_account_info(self, user, req): - html = self.load("http://www.fshare.vn/account_info.php", req=req) + html = self.load("http://www.fshare.vn/account_info.php") if re.search(self.LIFETIME_PATTERN, html): self.log_debug("Lifetime membership detected") @@ -49,8 +49,7 @@ class FshareVn(Account): post={'LoginForm[email]' : user, 'LoginForm[password]' : data['password'], 'LoginForm[rememberMe]': 1, - 'yt0' : "Login"}, - req=req) + 'yt0' : "Login"}) if not re.search(r'<img\s+alt="VIP"', html): self.wrong_password() diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py index 3a30f4d5a..bd6f72972 100644 --- a/module/plugins/accounts/HellshareCz.py +++ b/module/plugins/accounts/HellshareCz.py @@ -21,7 +21,7 @@ class HellshareCz(Account): def load_account_info(self, user, req): self.relogin(user) - html = self.load("http://www.hellshare.com/", req=req) + html = self.load("http://www.hellshare.com/") m = re.search(self.CREDIT_LEFT_PATTERN, html) if m is None: @@ -52,17 +52,17 @@ class HellshareCz(Account): def login(self, user, data, req): - html = self.load('http://www.hellshare.com/', req=req) + html = self.load('http://www.hellshare.com/') if req.lastEffectiveURL != 'http://www.hellshare.com/': # Switch to English self.log_debug("Switch lang - URL: %s" % req.lastEffectiveURL) - json = self.load("%s?do=locRouter-show" % req.lastEffectiveURL, req=req) + json = self.load("%s?do=locRouter-show" % req.lastEffectiveURL) hash = re.search(r"(\-\-[0-9a-f]+\-)", json).group(1) self.log_debug("Switch lang - HASH: %s" % hash) - html = self.load('http://www.hellshare.com/%s/' % hash, req=req) + html = self.load('http://www.hellshare.com/%s/' % hash) if re.search(self.CREDIT_LEFT_PATTERN, html): self.log_debug("Already logged in") @@ -73,8 +73,7 @@ class HellshareCz(Account): post={'login' : "Log in", 'password' : data['password'], 'username' : user, - 'perm_login': "on"}, - req=req) + 'perm_login': "on"}) if "<p>You input a wrong user name or wrong password</p>" in html: self.wrong_password() diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index 8be933c37..c3d99f88e 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -19,7 +19,7 @@ class HighWayMe(Account): validuntil = -1 trafficleft = None - json_data = self.load('https://high-way.me/api.php?user', req=req) + json_data = self.load('https://high-way.me/api.php?user') self.log_debug("JSON data: %s" % json_data) @@ -43,8 +43,7 @@ class HighWayMe(Account): html = self.load("https://high-way.me/api.php?login", post={'login': '1', 'user': user, - 'pass': data['password']}, - req=req) + 'pass': data['password']}) if 'UserOrPassInvalid' in html: self.wrong_password() diff --git a/module/plugins/accounts/Keep2ShareCc.py b/module/plugins/accounts/Keep2ShareCc.py index 5c6b3cce8..6b2a8d68a 100644 --- a/module/plugins/accounts/Keep2ShareCc.py +++ b/module/plugins/accounts/Keep2ShareCc.py @@ -28,7 +28,7 @@ class Keep2ShareCc(Account): trafficleft = -1 premium = False - html = self.load("http://keep2share.cc/site/profile.html", req=req) + html = self.load("http://keep2share.cc/site/profile.html") m = re.search(self.VALID_UNTIL_PATTERN, html) if m: @@ -66,8 +66,7 @@ class Keep2ShareCc(Account): post={'LoginForm[username]' : user, 'LoginForm[password]' : data['password'], 'LoginForm[rememberMe]': 1, - 'yt0' : ""}, - req=req) + 'yt0' : ""}) if re.search(self.LOGIN_FAIL_PATTERN, html): self.wrong_password() diff --git a/module/plugins/accounts/LetitbitNet.py b/module/plugins/accounts/LetitbitNet.py index a26e895c4..4702648a3 100644 --- a/module/plugins/accounts/LetitbitNet.py +++ b/module/plugins/accounts/LetitbitNet.py @@ -19,8 +19,7 @@ class LetitbitNet(Account): # api_key = self.get_account_data(user)['password'] # json_data = [api_key, ['key/info']] # api_rep = self.load("http://api.letitbit.net/json", - # post={'r': json_dumps(json_data)}, - # req=req) + # post={'r': json_dumps(json_data)}) # self.log_debug("API Key Info: " + api_rep) # api_rep = json_loads(api_rep) # diff --git a/module/plugins/accounts/LinksnappyCom.py b/module/plugins/accounts/LinksnappyCom.py index aa7db79e0..6a15e6be9 100644 --- a/module/plugins/accounts/LinksnappyCom.py +++ b/module/plugins/accounts/LinksnappyCom.py @@ -21,8 +21,7 @@ class LinksnappyCom(Account): r = self.load('http://gen.linksnappy.com/lseAPI.php', get={'act' : 'USERDETAILS', 'username': user, - 'password': hashlib.md5(data['password'], - req=req).hexdigest()}) + 'password': hashlib.md5(data['password']).hexdigest()}) self.log_debug("JSON data: " + r) @@ -56,8 +55,7 @@ class LinksnappyCom(Account): html = self.load("https://gen.linksnappy.com/lseAPI.php", get={'act' : 'USERDETAILS', 'username': user, - 'password': hashlib.md5(data['password'], - req=req).hexdigest()}) + 'password': hashlib.md5(data['password']).hexdigest()}) if "Invalid Account Details" in html: self.wrong_password() diff --git a/module/plugins/accounts/MegaDebridEu.py b/module/plugins/accounts/MegaDebridEu.py index 817dd800f..4f055ff37 100644 --- a/module/plugins/accounts/MegaDebridEu.py +++ b/module/plugins/accounts/MegaDebridEu.py @@ -23,8 +23,7 @@ class MegaDebridEu(Account): jsonResponse = self.load(self.API_URL, get={'action' : 'connectUser', 'login' : user, - 'password': data['password']}, - req=req) + 'password': data['password']}) res = json_loads(jsonResponse) if res['response_code'] == "ok": @@ -38,8 +37,7 @@ class MegaDebridEu(Account): jsonResponse = self.load(self.API_URL, get={'action' : 'connectUser', 'login' : user, - 'password': data['password']}, - req=req) + 'password': data['password']}) res = json_loads(jsonResponse) if res['response_code'] != "ok": self.wrong_password() diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py index d2f6cfaf7..b95a832e6 100644 --- a/module/plugins/accounts/MegaRapidCz.py +++ b/module/plugins/accounts/MegaRapidCz.py @@ -25,7 +25,7 @@ class MegaRapidCz(Account): def load_account_info(self, user, req): - htmll = self.load("http://megarapid.cz/mujucet/", req=req) + htmll = self.load("http://megarapid.cz/mujucet/") m = re.search(self.LIMITDL_PATTERN, htmll) if m: @@ -46,7 +46,7 @@ class MegaRapidCz(Account): def login(self, user, data, req): - html = self.load("http://megarapid.cz/prihlaseni/", req=req) + html = self.load("http://megarapid.cz/prihlaseni/") if "Heslo:" in html: start = html.index('id="inp_hash" name="hash" value="') @@ -57,5 +57,4 @@ class MegaRapidCz(Account): "login" : user, "pass1" : data['password'], "remember": 1, - "sbmt" : u"Přihlásit"}, - req=req) + "sbmt" : u"Přihlásit"}) diff --git a/module/plugins/accounts/MegaRapidoNet.py b/module/plugins/accounts/MegaRapidoNet.py index aa92f957a..92e5242bb 100644 --- a/module/plugins/accounts/MegaRapidoNet.py +++ b/module/plugins/accounts/MegaRapidoNet.py @@ -25,7 +25,7 @@ class MegaRapidoNet(Account): trafficleft = None premium = False - html = self.load("http://megarapido.net/gerador", req=req) + html = self.load("http://megarapido.net/gerador") validuntil = re.search(self.VALID_UNTIL_PATTERN, html) if validuntil: @@ -40,13 +40,12 @@ class MegaRapidoNet(Account): def login(self, user, data, req): - self.load("http://megarapido.net/login", req=req) + self.load("http://megarapido.net/login") self.load("http://megarapido.net/painel_user/ajax/logar.php", post={'login': user, - 'senha': data['password']}, - req=req) + 'senha': data['password']}) - html = self.load("http://megarapido.net/gerador", req=req) + html = self.load("http://megarapido.net/gerador") if "sair" not in html.lower(): self.wrong_password() diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py index d68002783..c91782a5f 100644 --- a/module/plugins/accounts/MegasharesCom.py +++ b/module/plugins/accounts/MegasharesCom.py @@ -21,7 +21,7 @@ class MegasharesCom(Account): def load_account_info(self, user, req): # self.relogin(user) - html = self.load("http://d01.megashares.com/myms.php", req=req) + html = self.load("http://d01.megashares.com/myms.php") premium = False if '>Premium Upgrade<' in html else True @@ -41,8 +41,7 @@ class MegasharesCom(Account): post={"httpref" : "", "myms_login" : "Login", "mymslogin_name": user, - "mymspassword" : data['password']}, - req=req) + "mymspassword" : data['password']}) if not '<span class="b ml">%s</span>' % user in html: self.wrong_password() diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py index 7052f2d7a..0c78a6707 100644 --- a/module/plugins/accounts/MultishareCz.py +++ b/module/plugins/accounts/MultishareCz.py @@ -21,13 +21,13 @@ class MultishareCz(Account): def load_account_info(self, user, req): # self.relogin(user) - html = self.load("http://www.multishare.cz/profil/", req=req) + html = self.load("http://www.multishare.cz/profil/") m = re.search(self.TRAFFIC_LEFT_PATTERN, html) trafficleft = self.parse_traffic(m.group('S') + m.group('U')) if m else 0 self.premium = True if trafficleft else False - html = self.load("http://www.multishare.cz/", req=req) + html = self.load("http://www.multishare.cz/") mms_info = dict(re.findall(self.ACCOUNT_INFO_PATTERN, html)) return dict(mms_info, **{"validuntil": -1, "trafficleft": trafficleft}) @@ -37,8 +37,7 @@ class MultishareCz(Account): html = self.load('https://www.multishare.cz/html/prihlaseni_process.php', post={"akce" : "Přihlásit", "heslo": data['password'], - "jmeno": user}, - req=req) + "jmeno": user}) if '<div class="akce-chyba akce">' in html: self.wrong_password() diff --git a/module/plugins/accounts/MyfastfileCom.py b/module/plugins/accounts/MyfastfileCom.py index 4e644dace..8303c1b52 100644 --- a/module/plugins/accounts/MyfastfileCom.py +++ b/module/plugins/accounts/MyfastfileCom.py @@ -28,8 +28,7 @@ class MyfastfileCom(Account): #: Password to use is the API-Password written in http://myfastfile.com/myaccount html = self.load("https://myfastfile.com/api.php", get={"user": user, - "pass": data['password']}, - req=req) + "pass": data['password']}) self.log_debug("JSON data: " + html) diff --git a/module/plugins/accounts/NitroflareCom.py b/module/plugins/accounts/NitroflareCom.py index f5845a0dd..6f17da7a3 100644 --- a/module/plugins/accounts/NitroflareCom.py +++ b/module/plugins/accounts/NitroflareCom.py @@ -29,8 +29,7 @@ class NitroflareCom(Account): premium = False html = self.load("https://nitroflare.com/member", - get={'s': "premium"}, - req=req) + get={'s': "premium"}) m = re.search(self.VALID_UNTIL_PATTERN, html) if m: @@ -68,7 +67,7 @@ class NitroflareCom(Account): def login(self, user, data, req): - html = self.load("https://nitroflare.com/login", req=req) + html = self.load("https://nitroflare.com/login") token = re.search(self.TOKEN_PATTERN, html).group(1) @@ -76,8 +75,7 @@ class NitroflareCom(Account): post={'login' : "", 'email' : user, 'password': data['password'], - 'token' : token}, - req=req) + 'token' : token}) if re.search(self.LOGIN_FAIL_PATTERN, html): self.wrong_password() diff --git a/module/plugins/accounts/NoPremiumPl.py b/module/plugins/accounts/NoPremiumPl.py index 6b7ac6d81..ee8ad62f4 100644 --- a/module/plugins/accounts/NoPremiumPl.py +++ b/module/plugins/accounts/NoPremiumPl.py @@ -79,5 +79,4 @@ class NoPremiumPl(Account): def run_auth_query(self): return self.load(self.API_URL, - post=self.create_auth_query(), - req=req) + post=self.create_auth_query()) diff --git a/module/plugins/accounts/NowVideoSx.py b/module/plugins/accounts/NowVideoSx.py index 6f6093dbb..47fedb044 100644 --- a/module/plugins/accounts/NowVideoSx.py +++ b/module/plugins/accounts/NowVideoSx.py @@ -24,7 +24,7 @@ class NowVideoSx(Account): trafficleft = -1 premium = None - html = self.load("http://www.nowvideo.sx/premium.php", req=req) + html = self.load("http://www.nowvideo.sx/premium.php") m = re.search(self.VALID_UNTIL_PATTERN, html) if m: @@ -50,8 +50,7 @@ class NowVideoSx(Account): def login(self, user, data, req): html = self.load("http://www.nowvideo.sx/login.php", post={'user': user, - 'pass': data['password']}, - req=req) + 'pass': data['password']}) if re.search(r'>Log In<', html): self.wrong_password() diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py index 2ec5ea53e..5557be206 100644 --- a/module/plugins/accounts/OboomCom.py +++ b/module/plugins/accounts/OboomCom.py @@ -37,8 +37,7 @@ class OboomCom(Account): result = json_loads(self.load("https://www.oboom.com/1/login", get={"auth": user, - "pass": pbkdf2}), - req=req) + "pass": pbkdf2})) if not result[0] == 200: self.log_warning(_("Failed to log in: %s") % result[1]) diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 62ff3e099..ef9274353 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -26,7 +26,7 @@ class OneFichierCom(Account): trafficleft = -1 premium = None - html = self.load("https://1fichier.com/console/abo.pl", req=req) + html = self.load("https://1fichier.com/console/abo.pl") m = re.search(self.VALID_UNTIL_PATTERN, html) if m: @@ -51,8 +51,7 @@ class OneFichierCom(Account): 'pass' : data['password'], 'It' : "on", 'purge' : "off", - 'valider': "Send"}, - req=req) + 'valider': "Send"}) if '>Invalid email address' in html or '>Invalid password' in html: self.wrong_password() diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py index 22f2f4d9f..b0e38c849 100644 --- a/module/plugins/accounts/OverLoadMe.py +++ b/module/plugins/accounts/OverLoadMe.py @@ -18,8 +18,7 @@ class OverLoadMe(Account): data = self.get_account_data(user) html = self.load("https://api.over-load.me/account.php", get={'user': user, - 'auth': data['password']}, - req=req).strip() + 'auth': data['password']}).strip() data = json_loads(html) self.log_debug(data) @@ -34,8 +33,7 @@ class OverLoadMe(Account): def login(self, user, data, req): jsondata = self.load("https://api.over-load.me/account.php", get={'user': user, - 'auth': data['password']}, - req=req).strip() + 'auth': data['password']}).strip() data = json_loads(jsondata) diff --git a/module/plugins/accounts/PremiumTo.py b/module/plugins/accounts/PremiumTo.py index af51f8f16..3afa0d59e 100644 --- a/module/plugins/accounts/PremiumTo.py +++ b/module/plugins/accounts/PremiumTo.py @@ -18,8 +18,7 @@ class PremiumTo(Account): def load_account_info(self, user, req): traffic = self.load("http://premium.to/api/straffic.php", #@TODO: Revert to `https` in 0.4.10 get={'username': self.username, - 'password': self.password}, - req=req) + 'password': self.password}) if "wrong username" not in traffic: trafficleft = sum(map(float, traffic.split(';'))) / 1024 #@TODO: Remove `/ 1024` in 0.4.10 @@ -33,8 +32,7 @@ class PremiumTo(Account): self.password = data['password'] authcode = self.load("http://premium.to/api/getauthcode.php", #@TODO: Revert to `https` in 0.4.10 get={'username': user, - 'password': self.password}, - req=req) + 'password': self.password}) if "wrong username" in authcode: self.wrong_password() diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py index 07eae058f..4054ba180 100644 --- a/module/plugins/accounts/QuickshareCz.py +++ b/module/plugins/accounts/QuickshareCz.py @@ -19,7 +19,7 @@ class QuickshareCz(Account): def load_account_info(self, user, req): - html = self.load("http://www.quickshare.cz/premium", req=req) + html = self.load("http://www.quickshare.cz/premium") m = re.search(self.TRAFFIC_LEFT_PATTERN, html) if m: @@ -36,8 +36,7 @@ class QuickshareCz(Account): html = self.load('http://www.quickshare.cz/html/prihlaseni_process.php', post={"akce" : u'Přihlásit', "heslo": data['password'], - "jmeno": user}, - req=req) + "jmeno": user}) if u'>Takový uživatel neexistuje.<' in html or u'>Špatné heslo.<' in html: self.wrong_password() diff --git a/module/plugins/accounts/RapideoPl.py b/module/plugins/accounts/RapideoPl.py index 173b29308..5183bfd7e 100644 --- a/module/plugins/accounts/RapideoPl.py +++ b/module/plugins/accounts/RapideoPl.py @@ -79,5 +79,4 @@ class RapideoPl(Account): def run_auth_query(self): return self.load(self.API_URL, - post=self.create_auth_query(), - req=req) + post=self.create_auth_query()) diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py index 098122aea..7732925b7 100644 --- a/module/plugins/accounts/RapidgatorNet.py +++ b/module/plugins/accounts/RapidgatorNet.py @@ -30,8 +30,7 @@ class RapidgatorNet(Account): assert sid html = self.load(urlparse.urljoin(self.API_URL, "info"), - get={'sid': sid}, - req=req) + get={'sid': sid}) self.log_debug("API:USERINFO", html) @@ -60,8 +59,7 @@ class RapidgatorNet(Account): try: html = self.load(urlparse.urljoin(self.API_URL, "login"), post={"username": user, - "password": data['password']}, - req=req) + "password": data['password']}) self.log_debug("API:LOGIN", html) diff --git a/module/plugins/accounts/RapiduNet.py b/module/plugins/accounts/RapiduNet.py index 6edd83592..86324e558 100644 --- a/module/plugins/accounts/RapiduNet.py +++ b/module/plugins/accounts/RapiduNet.py @@ -30,7 +30,7 @@ class RapiduNet(Account): trafficleft = -1 premium = False - html = self.load("https://rapidu.net/", req=req) + html = self.load("https://rapidu.net/") if re.search(self.PREMIUM_PATTERN, html): premium = True @@ -50,16 +50,14 @@ class RapiduNet(Account): self.load("https://rapidu.net/ajax.php", get={'a': "getChangeLang"}, post={'_go' : "", - 'lang': "en"}, - req=req) + 'lang': "en"}) json = json_loads(self.load("https://rapidu.net/ajax.php", get={'a': "getUserLogin"}, post={'_go' : "", 'login' : user, 'pass' : data['password'], - 'remember': "1"}, - req=req)) + 'remember': "1"})) self.log_debug(json) diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 1df84a7b0..6ec13e93f 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -19,7 +19,7 @@ class RealdebridCom(Account): if self.pin_code: return - html = self.load("https://real-debrid.com/api/account.php", req=req) + html = self.load("https://real-debrid.com/api/account.php") xml = dom.parseString(html) validuntil = float(xml.getElementsByTagName("expiration")[0].childNodes[0].nodeValue) @@ -34,8 +34,7 @@ class RealdebridCom(Account): html = self.load("https://real-debrid.com/ajax/login.php", get={"user": user, - "pass": data['password']}, - req=req) + "pass": data['password']}) if "Your login informations are incorrect" in html: self.wrong_password() diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py index deaf55340..fb7380d9c 100644 --- a/module/plugins/accounts/RehostTo.py +++ b/module/plugins/accounts/RehostTo.py @@ -27,8 +27,7 @@ class RehostTo(Account): html = self.load("http://rehost.to/api.php", get={'cmd' : "get_premium_credits", - 'long_ses': session}, - req=req) + 'long_ses': session}) if html.strip() == "0,0" or "ERROR" in html: self.log_debug(html) @@ -50,8 +49,7 @@ class RehostTo(Account): html = self.load("https://rehost.to/api.php", get={'cmd': "login", 'user': user, - 'pass': data['password']}, - req=req) + 'pass': data['password']}) if "ERROR" in html: self.log_debug(html) diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py index c9c6e2227..84b704f63 100644 --- a/module/plugins/accounts/SimplyPremiumCom.py +++ b/module/plugins/accounts/SimplyPremiumCom.py @@ -19,7 +19,7 @@ class SimplyPremiumCom(Account): validuntil = -1 trafficleft = None - json_data = self.load('http://www.simply-premium.com/api/user.php?format=json', req=req) + json_data = self.load('http://www.simply-premium.com/api/user.php?format=json') self.log_debug("JSON data: %s" % json_data) @@ -41,8 +41,7 @@ class SimplyPremiumCom(Account): req.cj.setCookie("simply-premium.com", "lang", "EN") html = self.load("https://www.simply-premium.com/login.php", - post={'key': user} if not data['password'] else {'login_name': user, 'login_pass': data['password']}, - req=req) + post={'key': user} if not data['password'] else {'login_name': user, 'login_pass': data['password']}) if 'logout' not in html: self.wrong_password() diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py index 14e33e827..e0044930f 100644 --- a/module/plugins/accounts/SimplydebridCom.py +++ b/module/plugins/accounts/SimplydebridCom.py @@ -17,7 +17,7 @@ class SimplydebridCom(Account): def load_account_info(self, user, req): get_data = {'login': 2, 'u': self.loginname, 'p': self.password} - res = self.load("http://simply-debrid.com/api.php", get=get_data, req=req) + res = self.load("http://simply-debrid.com/api.php", get=get_data) data = [x.strip() for x in res.split(";")] if str(data[0]) != "1": return {"premium": False} @@ -30,6 +30,6 @@ class SimplydebridCom(Account): self.password = data['password'] get_data = {'login': 1, 'u': self.loginname, 'p': self.password} - res = self.load("https://simply-debrid.com/api.php", get=get_data, req=req) + res = self.load("https://simply-debrid.com/api.php", get=get_data) if res != "02: loggin success": self.wrong_password() diff --git a/module/plugins/accounts/SmoozedCom.py b/module/plugins/accounts/SmoozedCom.py index a13bd14a8..cb3c7b1a3 100644 --- a/module/plugins/accounts/SmoozedCom.py +++ b/module/plugins/accounts/SmoozedCom.py @@ -76,5 +76,4 @@ class SmoozedCom(Account): return json_loads(self.load("http://www2.smoozed.com/api/login", get={'auth': user, - 'password': encrypted}, - req=req)) + 'password': encrypted})) diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index 18b6a658d..c6cd8d22f 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -17,7 +17,7 @@ class TurbobitNet(Account): def load_account_info(self, user, req): - html = self.load("http://turbobit.net", req=req) + html = self.load("http://turbobit.net") m = re.search(r'<u>Turbo Access</u> to ([\d.]+)', html) if m: @@ -36,8 +36,7 @@ class TurbobitNet(Account): html = self.load("http://turbobit.net/user/login", post={"user[login]" : user, "user[pass]" : data['password'], - "user[submit]": "Login"}, - req=req) + "user[submit]": "Login"}) if not '<div class="menu-item user-name">' in html: self.wrong_password() diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py index b18428887..62f1709bc 100644 --- a/module/plugins/accounts/UlozTo.py +++ b/module/plugins/accounts/UlozTo.py @@ -21,7 +21,7 @@ class UlozTo(Account): def load_account_info(self, user, req): - html = self.load("http://www.ulozto.net/", req=req) + html = self.load("http://www.ulozto.net/") m = re.search(self.TRAFFIC_LEFT_PATTERN, html) @@ -32,7 +32,7 @@ class UlozTo(Account): def login(self, user, data, req): - login_page = self.load('http://www.ulozto.net/?do=web-login', req=req) + login_page = self.load('http://www.ulozto.net/?do=web-login') action = re.findall('<form action="(.+?)"', login_page)[1].replace('&', '&') token = re.search('_token_" value="(.+?)"', login_page).group(1) @@ -42,8 +42,7 @@ class UlozTo(Account): 'login' : u"Přihlásit", 'password': data['password'], 'username': user, - 'remember': "on"}, - req=req) + 'remember': "on"}) if '<div class="flash error">' in html: self.wrong_password() diff --git a/module/plugins/accounts/UploadableCh.py b/module/plugins/accounts/UploadableCh.py index 0fce8eeac..c2b503052 100644 --- a/module/plugins/accounts/UploadableCh.py +++ b/module/plugins/accounts/UploadableCh.py @@ -14,7 +14,7 @@ class UploadableCh(Account): def load_account_info(self, user, req): - html = self.load("http://www.uploadable.ch/login.php", req=req) + html = self.load("http://www.uploadable.ch/login.php") premium = '<a href="/logout.php"' in html trafficleft = -1 if premium else None @@ -27,8 +27,7 @@ class UploadableCh(Account): post={'userName' : user, 'userPassword' : data['password'], 'autoLogin' : "1", - 'action__login': "normalLogin"}, - req=req) + 'action__login': "normalLogin"}) if "Login failed" in html: self.wrong_password() diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 956d43a72..3d1d0bbf5 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -26,7 +26,7 @@ class UploadedTo(Account): trafficleft = None premium = None - html = self.load("http://uploaded.net/me", req=req) + html = self.load("http://uploaded.net/me") premium = True if re.search(self.PREMIUM_PATTERN, html) else False @@ -66,8 +66,7 @@ class UploadedTo(Account): html = self.load("https://uploaded.net/io/login", post={'id': user, 'pw': data['password'], - '_': ""}, - req=req) + '_': ""}) if '"err"' in html: self.wrong_password() diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py index ffae50ce1..bb5eaa6c1 100644 --- a/module/plugins/accounts/UploadheroCom.py +++ b/module/plugins/accounts/UploadheroCom.py @@ -21,7 +21,7 @@ class UploadheroCom(Account): premium_pattern = re.compile('Il vous reste <span class="bleu">(\d+)</span> jours premium') data = self.get_account_data(user) - html = self.load("http://uploadhero.co/my-account", req=req) + html = self.load("http://uploadhero.co/my-account") if premium_pattern.search(html): end_date = datetime.date.today() + datetime.timedelta(days=int(premium_pattern.search(html).group(1))) @@ -36,8 +36,7 @@ class UploadheroCom(Account): def login(self, user, data, req): html = self.load("http://uploadhero.co/lib/connexion.php", post={"pseudo_login": user, - "password_login": data['password']}, - req=req) + "password_login": data['password']}) if "mot de passe invalide" in html: self.wrong_password() diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py index 6f6e0eed5..4fdabcb46 100644 --- a/module/plugins/accounts/UploadingCom.py +++ b/module/plugins/accounts/UploadingCom.py @@ -26,7 +26,7 @@ class UploadingCom(Account): trafficleft = None premium = None - html = self.load("http://uploading.com/", req=req) + html = self.load("http://uploading.com/") premium = False if re.search(self.PREMIUM_PATTERN, html) else True @@ -60,9 +60,8 @@ class UploadingCom(Account): ("uploading.com", "setlang" , "en"), ("uploading.com", "_lang" , "en")]) - self.load("http://uploading.com/", req=req) + self.load("http://uploading.com/") self.load("https://uploading.com/general/login_form/?JsHttpRequest=%s-xml" % long(time.time() * 1000), post={'email' : user, 'password': data['password'], - 'remember': "on"}, - req=req) + 'remember': "on"}) diff --git a/module/plugins/accounts/WebshareCz.py b/module/plugins/accounts/WebshareCz.py index 9f392bdb0..554d38951 100644 --- a/module/plugins/accounts/WebshareCz.py +++ b/module/plugins/accounts/WebshareCz.py @@ -43,8 +43,7 @@ class WebshareCz(Account): def login(self, user, data, req): salt = self.load("https://webshare.cz/api/salt/", post={'username_or_email': user, - 'wst' : ""}, - req=req) + 'wst' : ""}) if "<status>OK</status>" not in salt: self.wrong_password() @@ -58,8 +57,7 @@ class WebshareCz(Account): 'keep_logged_in' : 1, 'password' : password, 'username_or_email': user, - 'wst' : ""}, - req=req) + 'wst' : ""}) if "<status>OK</status>" not in login: self.wrong_password() diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py index dd4e33739..c2966f156 100644 --- a/module/plugins/accounts/YibaishiwuCom.py +++ b/module/plugins/accounts/YibaishiwuCom.py @@ -20,7 +20,7 @@ class YibaishiwuCom(Account): def load_account_info(self, user, req): # self.relogin(user) - html = self.load("http://115.com/", req=req) + html = self.load("http://115.com/") m = re.search(self.ACCOUNT_INFO_PATTERN, html, re.S) premium = True if m and 'is_vip: 1' in m.group(1) else False @@ -33,8 +33,7 @@ class YibaishiwuCom(Account): post={"back" : "http://www.115.com/", "goto" : "http://115.com/", "login[account]": user, - "login[passwd]" : data['password']}, - req=req) + "login[passwd]" : data['password']}) if not 'var USER_PERMISSION = {' in html: self.wrong_password() diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py index 5415575c5..cdf409b2d 100644 --- a/module/plugins/accounts/ZeveraCom.py +++ b/module/plugins/accounts/ZeveraCom.py @@ -64,8 +64,7 @@ class ZeveraCom(Account): res = self.load(self.API_URL, get=get_data, - just_header=just_header, - req=req) + just_header=just_header) self.log_debug(res) |