From 01e76034bcad5e5aab7f6e141782071e5c328649 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 6 Jul 2014 19:08:06 +0200 Subject: Fix account checkLogin + related code cosmetics --- module/plugins/accounts/TurbobitNet.py | 1 - 1 file changed, 1 deletion(-) (limited to 'module/plugins/accounts/TurbobitNet.py') diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index 19ffaf1e5..03e17430b 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -31,7 +31,6 @@ class TurbobitNet(Account): __author_name__ = "zoidberg" __author_mail__ = "zoidberg@mujmail.cz" - #login_timeout = 60 def loadAccountInfo(self, user, req): html = req.load("http://turbobit.net") -- cgit v1.2.3 From 48c0c42fd6faffc56432d5f037cd575979f180cc Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 14 Jul 2014 02:23:37 +0200 Subject: Removed all @author flags + key attributes cleanup for internal & hooks plugins --- module/plugins/accounts/TurbobitNet.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'module/plugins/accounts/TurbobitNet.py') diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index 03e17430b..9453b7fe0 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -13,8 +13,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . - - @author: zoidberg """ import re -- cgit v1.2.3 From 7b8c458cca7d21a029620f98e453f746fce69cd1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 14 Jul 2014 16:10:01 +0200 Subject: Prefer single quote for dict key name --- module/plugins/accounts/TurbobitNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/TurbobitNet.py') 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 '
' in html: -- cgit v1.2.3 From 8e47b0de30a25d0fd5dfb518bfe4e1e7beff93fd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 15 Jul 2014 16:27:44 +0200 Subject: Key attributes cleanup for account, container and crypter plugins --- module/plugins/accounts/TurbobitNet.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/TurbobitNet.py') diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index 956978cf3..5da480180 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -25,6 +25,7 @@ class TurbobitNet(Account): __name__ = "TurbobitNet" __version__ = "0.01" __type__ = "account" + __description__ = """TurbobitNet account plugin""" __author_name__ = "zoidberg" __author_mail__ = "zoidberg@mujmail.cz" -- cgit v1.2.3 From 9395182da7afed55a29bde1c7cbefe4204e783f0 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 20 Jul 2014 03:02:09 +0200 Subject: Store all re.search/match object as "m" instead "found" --- module/plugins/accounts/TurbobitNet.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/accounts/TurbobitNet.py') diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index 5da480180..7e0f8b8a7 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -34,10 +34,10 @@ class TurbobitNet(Account): def loadAccountInfo(self, user, req): html = req.load("http://turbobit.net") - found = re.search(r'Turbo Access to ([0-9.]+)', html) - if found: + m = re.search(r'Turbo Access to ([0-9.]+)', html) + if m: premium = True - validuntil = mktime(strptime(found.group(1), "%d.%m.%Y")) + validuntil = mktime(strptime(m.group(1), "%d.%m.%Y")) else: premium = False validuntil = -1 -- cgit v1.2.3 From ba916633f2bedb04c7358000b91aed69f52e8e43 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 1 Aug 2014 19:35:59 +0200 Subject: Remove trailing whitespaces + remove license headers + import urllib methods directly + sort and fix key attributes + use save_join instead join + sort some import declarations + other minor code cosmetics --- module/plugins/accounts/TurbobitNet.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'module/plugins/accounts/TurbobitNet.py') diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index 7e0f8b8a7..a477b06c0 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -1,20 +1,5 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . -""" - import re from time import mktime, strptime @@ -23,8 +8,8 @@ from module.plugins.Account import Account class TurbobitNet(Account): __name__ = "TurbobitNet" - __version__ = "0.01" __type__ = "account" + __version__ = "0.01" __description__ = """TurbobitNet account plugin""" __author_name__ = "zoidberg" -- cgit v1.2.3