From 9be1035b2945f82b269487a009c02bd5a83028b0 Mon Sep 17 00:00:00 2001 From: Stefano Date: Wed, 24 Jul 2013 14:24:51 +0200 Subject: Fixed PEP 8 violations in Hooks (cherry picked from commit 669b1e0ec048e1ed8aeb842b2570376e9ad96863) Conflicts: pyload/plugins/addons/CaptchaTrader.py pyload/plugins/addons/ClickAndLoad.py pyload/plugins/addons/Ev0InFetcher.py pyload/plugins/addons/ExternalScripts.py pyload/plugins/addons/ExtractArchive.py pyload/plugins/addons/HotFolder.py pyload/plugins/addons/MergeFiles.py pyload/plugins/addons/MultiHome.py pyload/plugins/addons/XMPPInterface.py --- pyload/plugins/addons/PremiumizeMe.py | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'pyload/plugins/addons/PremiumizeMe.py') diff --git a/pyload/plugins/addons/PremiumizeMe.py b/pyload/plugins/addons/PremiumizeMe.py index a10c24f85..07630420c 100644 --- a/pyload/plugins/addons/PremiumizeMe.py +++ b/pyload/plugins/addons/PremiumizeMe.py @@ -1,8 +1,9 @@ from module.plugins.internal.MultiHoster import MultiHoster -from module.common.json_layer import json_loads +from module.common.json_layer import json_loads from module.network.RequestFactory import getURL + class PremiumizeMe(MultiHoster): __name__ = "PremiumizeMe" __version__ = "0.12" @@ -10,41 +11,42 @@ class PremiumizeMe(MultiHoster): __description__ = """Premiumize.Me hook plugin""" __config__ = [("activated", "bool", "Activated", "False"), - ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), + ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), ("hosterList", "str", "Hoster list (comma separated)", ""), ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "24")] __author_name__ = ("Florian Franzen") __author_mail__ = ("FlorianFranzen@gmail.com") - - def getHoster(self): + + def getHoster(self): # If no accounts are available there will be no hosters available if not self.account or not self.account.canUse(): return [] - + # Get account data (user, data) = self.account.selectAccount() - - # Get supported hosters list from premiumize.me using the json API v1 (see https://secure.premiumize.me/?show=api) - answer = getURL("https://api.premiumize.me/pm-api/v1.php?method=hosterlist¶ms[login]=%s¶ms[pass]=%s" % (user, data['password'])) + + # Get supported hosters list from premiumize.me using the + # json API v1 (see https://secure.premiumize.me/?show=api) + answer = getURL("https://api.premiumize.me/pm-api/v1.php?method=hosterlist¶ms[login]=%s¶ms[pass]=%s" % ( + user, data['password'])) data = json_loads(answer) - - + # If account is not valid thera are no hosters available if data['status'] != 200: return [] - + # Extract hosters from json file - return data['result']['hosterlist'] - + return data['result']['hosterlist'] + def coreReady(self): # Get account plugin and check if there is a valid account available - self.account = self.core.accountManager.getAccountPlugin("PremiumizeMe") + self.account = self.core.accountManager.getAccountPlugin("PremiumizeMe") if not self.account.canUse(): self.account = None self.logError(_("Please add a valid premiumize.me account first and restart pyLoad.")) return - + # Run the overwriten core ready which actually enables the multihoster hook - return MultiHoster.coreReady(self) \ No newline at end of file + return MultiHoster.coreReady(self) -- cgit v1.2.3