From e2d4a21008fe1f44ca4d27abf2c18a85dda5df4a Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 4 Oct 2011 10:52:31 +0200 Subject: plugin cleanups --- module/plugins/hoster/WuploadCom.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'module/plugins/hoster/WuploadCom.py') diff --git a/module/plugins/hoster/WuploadCom.py b/module/plugins/hoster/WuploadCom.py index 93b45fbfe..11b61ae59 100644 --- a/module/plugins/hoster/WuploadCom.py +++ b/module/plugins/hoster/WuploadCom.py @@ -10,11 +10,8 @@ from module.plugins.Hoster import Hoster from module.plugins.Plugin import chunks from module.network.RequestFactory import getURL +from module.common.json_layer import json_loads -try: - from json import loads as json_loads -except ImportError: # pragma: no cover - from module.lib.simplejson import loads as json_loads def getInfo(urls): for chunk in chunks(urls, 20): @@ -84,6 +81,6 @@ class WuploadCom(Hoster): def getDomain(self): result = json_loads( - self.load(self.API_ADDRESS + "/utility?method=getWuploadDomainForCurrentIp&format=json", utf8=True)) + self.load(self.API_ADDRESS + "/utility?method=getWuploadDomainForCurrentIp&format=json", decode=True)) self.log.debug("%s: response to get domain %s" % (self.__name__, result)) return result["FSApi_Utility"]["getWuploadDomainForCurrentIp"]["response"] \ No newline at end of file -- cgit v1.2.3