diff options
author | RaNaN <Mast3rRaNaN@hotmail.de> | 2011-10-04 10:52:31 +0200 |
---|---|---|
committer | RaNaN <Mast3rRaNaN@hotmail.de> | 2011-10-04 10:52:31 +0200 |
commit | e2d4a21008fe1f44ca4d27abf2c18a85dda5df4a (patch) | |
tree | 71804983f54ad59baee2f1a0def78eb8e178e0e4 /module/plugins/hoster/FilesonicCom.py | |
parent | new l18n files (diff) | |
download | pyload-e2d4a21008fe1f44ca4d27abf2c18a85dda5df4a.tar.xz |
plugin cleanups
Diffstat (limited to 'module/plugins/hoster/FilesonicCom.py')
-rw-r--r-- | module/plugins/hoster/FilesonicCom.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py index 6535b04f1..a74bcc1c8 100644 --- a/module/plugins/hoster/FilesonicCom.py +++ b/module/plugins/hoster/FilesonicCom.py @@ -9,11 +9,8 @@ from module.plugins.ReCaptcha import ReCaptcha 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):
@@ -123,7 +120,7 @@ class FilesonicCom(Hoster): self.logDebug("Premium download")
api = self.API_ADDRESS + "/link?method=getDownloadLink&u=%s&p=%s&ids=%s" % (
- self.user, self.account.getAccountData(self.user)["password"], getId(self.pyfile.url))
+ self.user, self.account.getAccountData(self.user)["password"], getId(self.pyfile.url))
result = json_loads(self.load(api))
links = result["FSApi_Link"]["getDownloadLink"]["response"]["links"]
|