From 3a8d1ab28eb9d9cd1cd8fadf7e88289e323e66dc Mon Sep 17 00:00:00 2001 From: flubshi Date: Thu, 20 Mar 2014 14:30:46 +0100 Subject: Improve free-way plugin (thanks stickell for your comments!) --- module/plugins/accounts/FreeWayMe.py | 4 ++-- module/plugins/hooks/FreeWayMe.py | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py index ca895c456..087b380d9 100644 --- a/module/plugins/accounts/FreeWayMe.py +++ b/module/plugins/accounts/FreeWayMe.py @@ -31,7 +31,7 @@ class FreeWayMe(Account): def loadAccountInfo(self, user, req): status = self.getAccountStatus(user, req) - if status is False: + if not status: return False self.logDebug(status) @@ -54,7 +54,7 @@ class FreeWayMe(Account): status = self.getAccountStatus(user, req) # Check if user and password are valid - if status is False: + if not status: self.wrongPassword() def getAccountStatus(self, user, req): diff --git a/module/plugins/hooks/FreeWayMe.py b/module/plugins/hooks/FreeWayMe.py index 57de50d33..30d76cb8e 100644 --- a/module/plugins/hooks/FreeWayMe.py +++ b/module/plugins/hooks/FreeWayMe.py @@ -17,7 +17,7 @@ @author: Nicolas Giese """ -from module.network.RequestFactory import getURL, getRequest +from module.network.RequestFactory import getURL from module.plugins.internal.MultiHoster import MultiHoster class FreeWayMe(MultiHoster): @@ -34,8 +34,6 @@ class FreeWayMe(MultiHoster): __author_mail__ = ("james@free-way.me") def getHoster(self): - req = getRequest() - hostis = req.load("https://www.free-way.me/ajax/jd.php", get={"id": 3}).replace("\"", "").strip() - req.close() + hostis = getURL("https://www.free-way.me/ajax/jd.php", get={"id": 3}).replace("\"", "").strip() self.logDebug("hosters: %s" % hostis) return [x.strip() for x in hostis.split(",") if x.strip()] -- cgit v1.2.3