summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster/WuploadCom.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-10-04 10:52:31 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-10-04 10:52:31 +0200
commite2d4a21008fe1f44ca4d27abf2c18a85dda5df4a (patch)
tree71804983f54ad59baee2f1a0def78eb8e178e0e4 /module/plugins/hoster/WuploadCom.py
parentnew l18n files (diff)
downloadpyload-e2d4a21008fe1f44ca4d27abf2c18a85dda5df4a.tar.xz
plugin cleanups
Diffstat (limited to 'module/plugins/hoster/WuploadCom.py')
-rw-r--r--module/plugins/hoster/WuploadCom.py7
1 files changed, 2 insertions, 5 deletions
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