diff options
author | Walter Purcaro <vuolter@gmail.com> | 2014-07-14 16:10:01 +0200 |
---|---|---|
committer | Walter Purcaro <vuolter@gmail.com> | 2014-07-15 16:26:07 +0200 |
commit | 7b8c458cca7d21a029620f98e453f746fce69cd1 (patch) | |
tree | 9e97b0003a00ff8ac9ee6b777d94bb998c911d05 /module/plugins/accounts | |
parent | Fix code indentation, some bad whitespaces and missing authors + use 'not' in... (diff) | |
download | pyload-7b8c458cca7d21a029620f98e453f746fce69cd1.tar.xz |
Prefer single quote for dict key name
Diffstat (limited to 'module/plugins/accounts')
39 files changed, 91 insertions, 91 deletions
diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py index acfb6874a..ee0a2ff28 100644 --- a/module/plugins/accounts/AlldebridCom.py +++ b/module/plugins/accounts/AlldebridCom.py @@ -33,7 +33,7 @@ class AlldebridCom(Account): except: data = self.getAccountData(user) page = req.load("http://www.alldebrid.com/api.php?action=info_user&login=%s&pw=%s" % (user, - data["password"])) + data['password'])) self.logDebug(page) xml = dom.parseString(page) exp_time = time() + int(xml.getElementsByTagName("date")[0].childNodes[0].nodeValue) * 24 * 60 * 60 @@ -41,7 +41,7 @@ class AlldebridCom(Account): return account_info def login(self, user, data, req): - urlparams = urllib.urlencode({'action': 'login', 'login_login': user, 'login_password': data["password"]}) + urlparams = urllib.urlencode({'action': 'login', 'login_login': user, 'login_password': data['password']}) page = req.load("http://www.alldebrid.com/register/?%s" % urlparams) if "This login doesn't exist" in page: diff --git a/module/plugins/accounts/BayfilesCom.py b/module/plugins/accounts/BayfilesCom.py index 3f3086347..8f11af2ef 100644 --- a/module/plugins/accounts/BayfilesCom.py +++ b/module/plugins/accounts/BayfilesCom.py @@ -33,17 +33,17 @@ class BayfilesCom(Account): for _ in xrange(2): response = json_loads(req.load("http://api.bayfiles.com/v1/account/info")) self.logDebug(response) - if not response["error"]: + if not response['error']: break - self.logWarning(response["error"]) + self.logWarning(response['error']) self.relogin(user) return {"premium": bool(response['premium']), "trafficleft": -1, "validuntil": response['expires'] if response['expires'] >= int(time()) else -1} def login(self, user, data, req): - response = json_loads(req.load("http://api.bayfiles.com/v1/account/login/%s/%s" % (user, data["password"]))) + response = json_loads(req.load("http://api.bayfiles.com/v1/account/login/%s/%s" % (user, data['password']))) self.logDebug(response) - if response["error"]: - self.logError(response["error"]) + if response['error']: + self.logError(response['error']) self.wrongPassword() diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py index e6999df03..09ff76efb 100644 --- a/module/plugins/accounts/BitshareCom.py +++ b/module/plugins/accounts/BitshareCom.py @@ -39,6 +39,6 @@ class BitshareCom(Account): def login(self, user, data, req): page = req.load("http://bitshare.com/login.html", - post={"user": user, "password": data["password"], "submit": "Login"}, cookies=True) + post={"user": user, "password": data['password'], "submit": "Login"}, cookies=True) if "login" in req.lastEffectiveURL: self.wrongPassword() diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py index 4a664b29e..3545baa7e 100644 --- a/module/plugins/accounts/CzshareCom.py +++ b/module/plugins/accounts/CzshareCom.py @@ -46,7 +46,7 @@ class CzshareCom(Account): def login(self, user, data, req): html = req.load('https://sdilej.cz/index.php', post={ "Prihlasit": "Prihlasit", - "login-password": data["password"], + "login-password": data['password'], "login-name": user }) diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py index dd714102f..29aef4546 100644 --- a/module/plugins/accounts/DebridItaliaCom.py +++ b/module/plugins/accounts/DebridItaliaCom.py @@ -43,6 +43,6 @@ class DebridItaliaCom(Account): def login(self, user, data, req): self.html = req.load("http://debriditalia.com/login.php", - get={"u": user, "p": data["password"]}) + get={"u": user, "p": data['password']}) if 'NO' in self.html: self.wrongPassword() diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py index 95a9cc852..2b46807e8 100644 --- a/module/plugins/accounts/DepositfilesCom.py +++ b/module/plugins/accounts/DepositfilesCom.py @@ -40,6 +40,6 @@ class DepositfilesCom(Account): def login(self, user, data, req): req.load("http://depositfiles.com/de/gold/payment.php") src = req.load("http://depositfiles.com/de/login.php", get={"return": "/de/gold/payment.php"}, - post={"login": user, "password": data["password"]}) + post={"login": user, "password": data['password']}) if r'<div class="error_message">Sie haben eine falsche Benutzername-Passwort-Kombination verwendet.</div>' in src: self.wrongPassword() diff --git a/module/plugins/accounts/EgoFilesCom.py b/module/plugins/accounts/EgoFilesCom.py index e5c781068..9cb157516 100644 --- a/module/plugins/accounts/EgoFilesCom.py +++ b/module/plugins/accounts/EgoFilesCom.py @@ -37,6 +37,6 @@ class EgoFilesCom(Account): html = req.load("http://egofiles.com/ajax/register.php", post={"log": 1, "loginV": user, - "passV": data["password"]}) + "passV": data['password']}) if 'Login successful' not in html: self.wrongPassword() diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py index 93c193625..779e2227c 100644 --- a/module/plugins/accounts/EuroshareEu.py +++ b/module/plugins/accounts/EuroshareEu.py @@ -47,7 +47,7 @@ class EuroshareEu(Account): html = req.load('http://euroshare.eu/customer-zone/login/', post={ "trvale": "1", "login": user, - "password": data["password"] + "password": data['password'] }, decode=True) if u">Nesprávne prihlasovacie meno alebo heslo" in html: diff --git a/module/plugins/accounts/FastixRu.py b/module/plugins/accounts/FastixRu.py index dbfd1f33e..6aec55a84 100644 --- a/module/plugins/accounts/FastixRu.py +++ b/module/plugins/accounts/FastixRu.py @@ -14,7 +14,7 @@ class FastixRu(Account): def loadAccountInfo(self, user, req): data = self.getAccountData(user) - page = req.load("http://fastix.ru/api_v2/?apikey=%s&sub=getaccountdetails" % (data["api"])) + page = req.load("http://fastix.ru/api_v2/?apikey=%s&sub=getaccountdetails" % (data['api'])) page = json_loads(page) points = page['points'] kb = float(points) @@ -26,9 +26,9 @@ class FastixRu(Account): return account_info def login(self, user, data, req): - page = req.load("http://fastix.ru/api_v2/?sub=get_apikey&email=%s&password=%s" % (user, data["password"])) + page = req.load("http://fastix.ru/api_v2/?sub=get_apikey&email=%s&password=%s" % (user, data['password'])) api = json_loads(page) api = api['apikey'] - data["api"] = api + data['api'] = api if "error_code" in page: self.wrongPassword() diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py index a45eb3288..17eda5ae3 100644 --- a/module/plugins/accounts/FilecloudIo.py +++ b/module/plugins/accounts/FilecloudIo.py @@ -48,7 +48,7 @@ class FilecloudIo(Account): rep = json_loads(rep) if rep['is_premium'] == 1: - return {"validuntil": int(rep["premium_until"]), "trafficleft": -1} + return {"validuntil": int(rep['premium_until']), "trafficleft": -1} else: return {"premium": False} @@ -59,8 +59,8 @@ class FilecloudIo(Account): if not hasattr(self, "form_data"): self.form_data = {} - self.form_data["username"] = user - self.form_data["password"] = data['password'] + self.form_data['username'] = user + self.form_data['password'] = data['password'] html = req.load('https://secure.filecloud.io/user-login_p.html', post=self.form_data, diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py index 0eded0edf..40626fe1e 100644 --- a/module/plugins/accounts/FilefactoryCom.py +++ b/module/plugins/accounts/FilefactoryCom.py @@ -51,7 +51,7 @@ class FilefactoryCom(Account): html = req.load("http://www.filefactory.com/member/signin.php", post={ "loginEmail": user, - "loginPassword": data["password"], + "loginPassword": data['password'], "Submit": "Sign In"}) if req.lastEffectiveURL != "http://www.filefactory.com/account/": diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py index 127894dd7..9ca35537a 100644 --- a/module/plugins/accounts/FilejungleCom.py +++ b/module/plugins/accounts/FilejungleCom.py @@ -50,7 +50,7 @@ class FilejungleCom(Account): def login(self, user, data, req): html = req.load(self.URL + "login.php", post={ "loginUserName": user, - "loginUserPassword": data["password"], + "loginUserPassword": data['password'], "loginFormSubmit": "Login", "recaptcha_challenge_field": "", "recaptcha_response_field": "", diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py index 28ddf2e3f..747051e94 100644 --- a/module/plugins/accounts/FilerNet.py +++ b/module/plugins/accounts/FilerNet.py @@ -55,7 +55,7 @@ class FilerNet(Account): self.html = req.load("https://filer.net/login") token = re.search(self.TOKEN_PATTERN, self.html).group(1) self.html = req.load("https://filer.net/login_check", - post={"_username": user, "_password": data["password"], + post={"_username": user, "_password": data['password'], "_remember_me": "on", "_csrf_token": token, "_target_path": "https://filer.net/"}) if 'Logout' not in self.html: self.wrongPassword() diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 8028083ec..a8b2b4529 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -32,25 +32,25 @@ class FileserveCom(Account): def loadAccountInfo(self, user, req): data = self.getAccountData(user) - page = req.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data["password"], + page = req.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'], "submit": "Submit+Query"}) res = json_loads(page) - if res["type"] == "premium": - validuntil = mktime(strptime(res["expireTime"], "%Y-%m-%d %H:%M:%S")) - return {"trafficleft": res["traffic"], "validuntil": validuntil} + if res['type'] == "premium": + validuntil = mktime(strptime(res['expireTime'], "%Y-%m-%d %H:%M:%S")) + return {"trafficleft": res['traffic'], "validuntil": validuntil} else: return {"premium": False, "trafficleft": None, "validuntil": None} def login(self, user, data, req): - page = req.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data["password"], + page = req.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'], "submit": "Submit+Query"}) res = json_loads(page) - if not res["type"]: + if not res['type']: self.wrongPassword() #login at fileserv page req.load("http://www.fileserve.com/login.php", - post={"loginUserName": user, "loginUserPassword": data["password"], "autoLogin": "checked", + post={"loginUserName": user, "loginUserPassword": data['password'], "autoLogin": "checked", "loginFormSubmit": "Login"}) diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py index 61dee5dbc..58dfb93fd 100644 --- a/module/plugins/accounts/FreeWayMe.py +++ b/module/plugins/accounts/FreeWayMe.py @@ -34,19 +34,19 @@ class FreeWayMe(Account): self.logDebug(status) account_info = {"validuntil": -1, "premium": False} - if status["premium"] == "Free": - account_info["trafficleft"] = int(status["guthaben"]) * 1024 - elif status["premium"] == "Spender": - account_info["trafficleft"] = -1 - elif status["premium"] == "Flatrate": - account_info = {"validuntil": int(status["Flatrate"]), + if status['premium'] == "Free": + account_info['trafficleft'] = int(status['guthaben']) * 1024 + elif status['premium'] == "Spender": + account_info['trafficleft'] = -1 + elif status['premium'] == "Flatrate": + account_info = {"validuntil": int(status['Flatrate']), "trafficleft": -1, "premium": True} return account_info def getpw(self, user): - return self.accounts[user]["password"] + return self.accounts[user]['password'] def login(self, user, data, req): status = self.getAccountStatus(user, req) @@ -57,7 +57,7 @@ class FreeWayMe(Account): def getAccountStatus(self, user, req): answer = req.load("https://www.free-way.me/ajax/jd.php", - get={"id": 4, "user": user, "pass": self.accounts[user]["password"]}) + get={"id": 4, "user": user, "pass": self.accounts[user]['password']}) self.logDebug("login: %s" % answer) if answer == "Invalid login": self.wrongPassword() diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py index 9b16741fc..5823c09f0 100644 --- a/module/plugins/accounts/HellshareCz.py +++ b/module/plugins/accounts/HellshareCz.py @@ -78,7 +78,7 @@ class HellshareCz(Account): html = req.load('http://www.hellshare.com/login?do=loginForm-submit', post={ "login": "Log in", - "password": data["password"], + "password": data['password'], "username": user, "perm_login": "on" }) diff --git a/module/plugins/accounts/HotfileCom.py b/module/plugins/accounts/HotfileCom.py index f053b7720..fd675b7c6 100644 --- a/module/plugins/accounts/HotfileCom.py +++ b/module/plugins/accounts/HotfileCom.py @@ -40,12 +40,12 @@ class HotfileCom(Account): info[key] = value if info['is_premium'] == '1': - info["premium_until"] = info["premium_until"].replace("T", " ") - zone = info["premium_until"][19:] - info["premium_until"] = info["premium_until"][:19] + info['premium_until'] = info['premium_until'].replace("T", " ") + zone = info['premium_until'][19:] + info['premium_until'] = info['premium_until'][:19] zone = int(zone[:3]) - validuntil = int(mktime(strptime(info["premium_until"], "%Y-%m-%d %H:%M:%S"))) + (zone * 60 * 60) + validuntil = int(mktime(strptime(info['premium_until'], "%Y-%m-%d %H:%M:%S"))) + (zone * 60 * 60) tmp = {"validuntil": validuntil, "trafficleft": -1, "premium": True} elif info['is_premium'] == '0': @@ -63,7 +63,7 @@ class HotfileCom(Account): digest = req.load("http://api.hotfile.com/", post={"action": "getdigest"}) h = hashlib.md5() - h.update(data["password"]) + h.update(data['password']) hp = h.hexdigest() h = hashlib.md5() h.update(hp) @@ -80,7 +80,7 @@ class HotfileCom(Account): cj = self.getAccountCookies(user) cj.setCookie("hotfile.com", "lang", "en") req.load("http://hotfile.com/", cookies=True) - page = req.load("http://hotfile.com/login.php", post={"returnto": "/", "user": user, "pass": data["password"]}, + page = req.load("http://hotfile.com/login.php", post={"returnto": "/", "user": user, "pass": data['password']}, cookies=True) if "Bad username/password" in page: diff --git a/module/plugins/accounts/LetitbitNet.py b/module/plugins/accounts/LetitbitNet.py index e37c860a6..e4601ccbb 100644 --- a/module/plugins/accounts/LetitbitNet.py +++ b/module/plugins/accounts/LetitbitNet.py @@ -29,7 +29,7 @@ class LetitbitNet(Account): def loadAccountInfo(self, user, req): ## DISABLED BECAUSE IT GET 'key exausted' EVEN IF VALID ## # api_key = self.accounts[user]['password'] - # json_data = [api_key, ["key/info"]] + # json_data = [api_key, ['key/info']] # api_rep = req.load('http://api.letitbit.net/json', post={'r': json_dumps(json_data)}) # self.logDebug('API Key Info: ' + api_rep) # api_rep = json_loads(api_rep) diff --git a/module/plugins/accounts/MegaDebridEu.py b/module/plugins/accounts/MegaDebridEu.py index 1fbe00ff7..e5d7deb3c 100644 --- a/module/plugins/accounts/MegaDebridEu.py +++ b/module/plugins/accounts/MegaDebridEu.py @@ -32,18 +32,18 @@ class MegaDebridEu(Account): def loadAccountInfo(self, user, req): data = self.getAccountData(user) jsonResponse = req.load(self.API_URL, - get={'action': 'connectUser', 'login': user, 'password': data["password"]}) + get={'action': 'connectUser', 'login': user, 'password': data['password']}) response = json_loads(jsonResponse) - if response["response_code"] == "ok": - return {"premium": True, "validuntil": float(response["vip_end"]), "status": True} + if response['response_code'] == "ok": + return {"premium": True, "validuntil": float(response['vip_end']), "status": True} else: self.logError(response) return {"status": False, "premium": False} def login(self, user, data, req): jsonResponse = req.load(self.API_URL, - get={'action': 'connectUser', 'login': user, 'password': data["password"]}) + get={'action': 'connectUser', 'login': user, 'password': data['password']}) response = json_loads(jsonResponse) - if response["response_code"] != "ok": + if response['response_code'] != "ok": self.wrongPassword() diff --git a/module/plugins/accounts/MultiDebridCom.py b/module/plugins/accounts/MultiDebridCom.py index 704b4ac78..d38247051 100644 --- a/module/plugins/accounts/MultiDebridCom.py +++ b/module/plugins/accounts/MultiDebridCom.py @@ -38,7 +38,7 @@ class MultiDebridCom(Account): def login(self, user, data, req): # Password to use is the API-Password written in http://multi-debrid.com/myaccount self.html = req.load("http://multi-debrid.com/api.php", - get={"user": user, "pass": data["password"]}) + get={"user": user, "pass": data['password']}) self.logDebug('JSON data: ' + self.html) self.json_data = json_loads(self.html) if self.json_data['status'] != 'ok': diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py index 19fcea67a..b21e793fd 100644 --- a/module/plugins/accounts/OboomCom.py +++ b/module/plugins/accounts/OboomCom.py @@ -16,7 +16,7 @@ class OboomCom(Account): __author_mail__ = "stanley.foerster@gmail.com" def loadAccountData(self, user, req): - passwd = self.getAccountData(user)["password"] + passwd = self.getAccountData(user)['password'] salt = passwd[::-1] pbkdf2 = PBKDF2(passwd, salt, 1000).hexread(16) result = json_loads(req.load("https://www.oboom.com/1.0/login", get={"auth": user, "pass": pbkdf2})) @@ -27,17 +27,17 @@ class OboomCom(Account): def loadAccountInfo(self, name, req): accountData = self.loadAccountData(name, req) - userData = accountData["user"] + userData = accountData['user'] if "premium_unix" in userData: - validUntilUtc = int(userData["premium_unix"]) + validUntilUtc = int(userData['premium_unix']) if validUntilUtc > int(time.time()): premium = True validUntil = validUntilUtc - traffic = userData["traffic"] - trafficLeft = traffic["current"] - maxTraffic = traffic["max"] - session = accountData["session"] + traffic = userData['traffic'] + trafficLeft = traffic['current'] + maxTraffic = traffic['max'] + session = accountData['session'] return {"premium": premium, "validuntil": validUntil, "trafficleft": trafficLeft / 1024, diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 7c14f8191..22cbd51d3 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -40,7 +40,7 @@ class OneFichierCom(Account): html = req.load("http://1fichier.com/login.pl?lg=en", post={ "mail": user, - "pass": data["password"], + "pass": data['password'], "Login": "Login"}) if r'<div class="error_message">Invalid username or password.</div>' in html: diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py index eab20480f..7c57fc88c 100644 --- a/module/plugins/accounts/OverLoadMe.py +++ b/module/plugins/accounts/OverLoadMe.py @@ -14,20 +14,20 @@ class OverLoadMe(Account): def loadAccountInfo(self, user, req): data = self.getAccountData(user) - page = req.load("https://api.over-load.me/account.php", get={"user": user, "auth": data["password"]}).strip() + page = req.load("https://api.over-load.me/account.php", get={"user": user, "auth": data['password']}).strip() data = json_loads(page) # Check for premium - if data["membership"] == "Free": + if data['membership'] == "Free": return {"premium": False} - account_info = {"validuntil": data["expirationunix"], "trafficleft": -1} + account_info = {"validuntil": data['expirationunix'], "trafficleft": -1} return account_info def login(self, user, data, req): jsondata = req.load("https://api.over-load.me/account.php", - get={"user": user, "auth": data["password"]}).strip() + get={"user": user, "auth": data['password']}).strip() data = json_loads(jsondata) - if data["err"] == 1: + if data['err'] == 1: self.wrongPassword() diff --git a/module/plugins/accounts/Premium4Me.py b/module/plugins/accounts/Premium4Me.py index c80f40f5c..0da442da6 100644 --- a/module/plugins/accounts/Premium4Me.py +++ b/module/plugins/accounts/Premium4Me.py @@ -21,7 +21,7 @@ class Premium4Me(Account): def login(self, user, data, req): self.authcode = req.load("http://premium.to/api/getauthcode.php?username=%s&password=%s" % ( - user, data["password"])).strip() + user, data['password'])).strip() if "wrong username" in self.authcode: self.wrongPassword() diff --git a/module/plugins/accounts/RapidshareCom.py b/module/plugins/accounts/RapidshareCom.py index 0676a7d5b..d537a2f23 100644 --- a/module/plugins/accounts/RapidshareCom.py +++ b/module/plugins/accounts/RapidshareCom.py @@ -30,7 +30,7 @@ class RapidshareCom(Account): data = self.getAccountData(user) api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi" api_param_prem = {"sub": "getaccountdetails", "type": "prem", "login": user, - "password": data["password"], "withcookie": 1} + "password": data['password'], "withcookie": 1} src = req.load(api_url_base, cookies=False, get=api_param_prem) if src.startswith("ERROR"): raise Exception(src) @@ -42,7 +42,7 @@ class RapidshareCom(Account): k, v = t.split("=") info[k] = v - validuntil = int(info["billeduntil"]) + validuntil = int(info['billeduntil']) premium = True if validuntil else False tmp = {"premium": premium, "validuntil": validuntil, "trafficleft": -1, "maxtraffic": -1} @@ -52,7 +52,7 @@ class RapidshareCom(Account): def login(self, user, data, req): api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi" api_param_prem = {"sub": "getaccountdetails", "type": "prem", "login": user, - "password": data["password"], "withcookie": 1} + "password": data['password'], "withcookie": 1} src = req.load(api_url_base, cookies=False, get=api_param_prem) if src.startswith("ERROR"): raise Exception(src + "### Note you have to use your account number for login, instead of name.") @@ -64,4 +64,4 @@ class RapidshareCom(Account): k, v = t.split("=") info[k] = v cj = self.getAccountCookies(user) - cj.setCookie("rapidshare.com", "enc", info["cookie"]) + cj.setCookie("rapidshare.com", "enc", info['cookie']) diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 86ad18085..75666f2fd 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -25,7 +25,7 @@ class RealdebridCom(Account): def login(self, user, data, req): self.pin_code = False - page = req.load("https://real-debrid.com/ajax/login.php", get={"user": user, "pass": data["password"]}) + page = req.load("https://real-debrid.com/ajax/login.php", get={"user": user, "pass": data['password']}) if "Your login informations are incorrect" in page: self.wrongPassword() elif "PIN Code required" in page: diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py index c4aa85484..5578cab7b 100644 --- a/module/plugins/accounts/RehostTo.py +++ b/module/plugins/accounts/RehostTo.py @@ -13,7 +13,7 @@ class RehostTo(Account): def loadAccountInfo(self, user, req): data = self.getAccountData(user) - page = req.load("http://rehost.to/api.php?cmd=login&user=%s&pass=%s" % (user, data["password"])) + page = req.load("http://rehost.to/api.php?cmd=login&user=%s&pass=%s" % (user, data['password'])) data = [x.split("=") for x in page.split(",")] ses = data[0][1] long_ses = data[1][1] @@ -29,7 +29,7 @@ class RehostTo(Account): return account_info def login(self, user, data, req): - page = req.load("http://rehost.to/api.php?cmd=login&user=%s&pass=%s" % (user, data["password"])) + page = req.load("http://rehost.to/api.php?cmd=login&user=%s&pass=%s" % (user, data['password'])) if "Login failed." in page: self.wrongPassword() diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py index 6a15c4c82..a57e5fcec 100644 --- a/module/plugins/accounts/RyushareCom.py +++ b/module/plugins/accounts/RyushareCom.py @@ -16,6 +16,6 @@ class RyushareCom(XFSPAccount): def login(self, user, data, req): req.lastURL = "http://ryushare.com/login.python" html = req.load("http://ryushare.com/login.python", - post={"login": user, "password": data["password"], "op": "login"}) + post={"login": user, "password": data['password'], "op": "login"}) if 'Incorrect Login or Password' in html or '>Error<' in html: self.wrongPassword() diff --git a/module/plugins/accounts/ShareRapidCom.py b/module/plugins/accounts/ShareRapidCom.py index 38150e5cf..11cef84e3 100644 --- a/module/plugins/accounts/ShareRapidCom.py +++ b/module/plugins/accounts/ShareRapidCom.py @@ -21,7 +21,7 @@ class ShareRapidCom(Account): found = re.search(ur'<td>Max. počet paralelních stahování: </td><td>(\d+)', src) if found: data = self.getAccountData(user) - data["options"]["limitDL"] = [int(found.group(1))] + data['options']['limitDL'] = [int(found.group(1))] found = re.search(ur'<td>Paušální stahování aktivní. Vyprší </td><td><strong>(.*?)</strong>', src) if found: @@ -44,6 +44,6 @@ class ShareRapidCom(Account): htm = req.load("http://sharerapid.cz/prihlaseni/", post={"hash": hashes, "login": user, - "pass1": data["password"], + "pass1": data['password'], "remember": 0, "sbmt": u"Přihlásit"}, cookies=True) diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 37ca373e4..f8c9f4fe0 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -28,7 +28,7 @@ class ShareonlineBiz(Account): def getUserAPI(self, user, req): return req.load("http://api.share-online.biz/account.php", - {"username": user, "password": self.accounts[user]["password"], "act": "userDetails"}) + {"username": user, "password": self.accounts[user]['password'], "act": "userDetails"}) def loadAccountInfo(self, user, req): src = self.getUserAPI(user, req) @@ -40,14 +40,14 @@ class ShareonlineBiz(Account): info[key] = value self.logDebug(info) - if "dl" in info and info["dl"].lower() != "not_available": - req.cj.setCookie("share-online.biz", "dl", info["dl"]) - if "a" in info and info["a"].lower() != "not_available": - req.cj.setCookie("share-online.biz", "a", info["a"]) + if "dl" in info and info['dl'].lower() != "not_available": + req.cj.setCookie("share-online.biz", "dl", info['dl']) + if "a" in info and info['a'].lower() != "not_available": + req.cj.setCookie("share-online.biz", "a", info['a']) - return {"validuntil": int(info["expire_date"]) if "expire_date" in info else -1, + return {"validuntil": int(info['expire_date']) if "expire_date" in info else -1, "trafficleft": -1, - "premium": True if ("dl" in info or "a" in info) and (info["group"] != "Sammler") else False} + "premium": True if ("dl" in info or "a" in info) and (info['group'] != "Sammler") else False} def login(self, user, data, req): src = self.getUserAPI(user, req) diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py index 6ae8396db..5706bb5cd 100644 --- a/module/plugins/accounts/SimplyPremiumCom.py +++ b/module/plugins/accounts/SimplyPremiumCom.py @@ -49,7 +49,7 @@ class SimplyPremiumCom(Account): if data['password'] == '' or data['password'] == '0': post_data = {"key": user} else: - post_data = {"login_name": user, "login_pass": data["password"]} + post_data = {"login_name": user, "login_pass": data['password']} self.html = req.load("http://www.simply-premium.com/login.php", post=post_data) diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py index c07702105..edd52b67e 100644 --- a/module/plugins/accounts/SimplydebridCom.py +++ b/module/plugins/accounts/SimplydebridCom.py @@ -24,7 +24,7 @@ class SimplydebridCom(Account): def login(self, user, data, req): self.loginname = user - self.password = data["password"] + self.password = data['password'] get_data = {'login': 1, 'u': self.loginname, 'p': self.password} response = req.load("http://simply-debrid.com/api.php", get=get_data, decode=True) if response != "02: loggin success": diff --git a/module/plugins/accounts/StahnuTo.py b/module/plugins/accounts/StahnuTo.py index 9ea119502..c72745833 100644 --- a/module/plugins/accounts/StahnuTo.py +++ b/module/plugins/accounts/StahnuTo.py @@ -41,7 +41,7 @@ class StahnuTo(Account): def login(self, user, data, req): html = req.load("http://www.stahnu.to/login.php", post={ "username": user, - "password": data["password"], + "password": data['password'], "submit": "Login"}) if not '<a href="logout.php">' in html: diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index 9453b7fe0..956978cf3 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -48,7 +48,7 @@ class TurbobitNet(Account): html = req.load("http://turbobit.net/user/login", post={ "user[login]": user, - "user[pass]": data["password"], + "user[pass]": data['password'], "user[submit]": "Login"}) if not '<div class="menu-item user-name">' in html: diff --git a/module/plugins/accounts/UnrestrictLi.py b/module/plugins/accounts/UnrestrictLi.py index 2b647a49c..afc2f2a18 100644 --- a/module/plugins/accounts/UnrestrictLi.py +++ b/module/plugins/accounts/UnrestrictLi.py @@ -47,7 +47,7 @@ class UnrestrictLi(Account): self.logError("A Captcha is required. Go to http://unrestrict.li/sign_in and login, then retry") return - post_data = {"username": user, "password": data["password"], + post_data = {"username": user, "password": data['password'], "remember_me": "remember", "signin": "Sign in"} self.html = req.load("https://unrestrict.li/sign_in", post=post_data) diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index d5c04564d..382b01052 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -60,7 +60,7 @@ class UploadedTo(Account): req.load("http://uploaded.net/language/en") req.cj.setCookie("uploaded.net", "lang", "en") - page = req.load("http://uploaded.net/io/login", post={"id": user, "pw": data["password"], "_": ""}) + page = req.load("http://uploaded.net/io/login", post={"id": user, "pw": data['password'], "_": ""}) if "User and password do not match!" in page: self.wrongPassword() diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py index 8adcff4ac..0cec8ca6d 100644 --- a/module/plugins/accounts/UploadheroCom.py +++ b/module/plugins/accounts/UploadheroCom.py @@ -32,7 +32,7 @@ class UploadheroCom(Account): def login(self, user, data, req): page = req.load("http://uploadhero.co/lib/connexion.php", - post={"pseudo_login": user, "password_login": data["password"]}) + post={"pseudo_login": user, "password_login": data['password']}) if "mot de passe invalide" in page: self.wrongPassword() diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py index 98a5fcbc5..c9f5a9ede 100644 --- a/module/plugins/accounts/UploadingCom.py +++ b/module/plugins/accounts/UploadingCom.py @@ -50,4 +50,4 @@ class UploadingCom(Account): req.cj.setCookie("uploading.com", "_lang", "en") req.load("http://uploading.com/") req.load("http://uploading.com/general/login_form/?JsHttpRequest=%s-xml" % long(time() * 1000), - post={"email": user, "password": data["password"], "remember": "on"}) + post={"email": user, "password": data['password'], "remember": "on"}) diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py index 1eb90801a..74383ec22 100644 --- a/module/plugins/accounts/ZeveraCom.py +++ b/module/plugins/accounts/ZeveraCom.py @@ -27,7 +27,7 @@ class ZeveraCom(Account): def login(self, user, data, req): self.loginname = user - self.password = data["password"] + self.password = data['password'] if self.getAPIData(req) == "No traffic": self.wrongPassword() |