diff options
Diffstat (limited to 'pyload/plugins')
| -rw-r--r-- | pyload/plugins/crypter/LixIn.py | 1 | ||||
| -rw-r--r-- | pyload/plugins/hoster/MegacrypterCom.py | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pyload/plugins/crypter/LixIn.py b/pyload/plugins/crypter/LixIn.py index b7a188e81..52abe1b3c 100644 --- a/pyload/plugins/crypter/LixIn.py +++ b/pyload/plugins/crypter/LixIn.py @@ -46,7 +46,6 @@ class LixIn(Crypter): post={"capt": captcharesult, "submit": "submit", "tiny": id}) else: self.logDebug("no captcha/captcha solved") - break else: self.html = self.req.load(url, decode=True, post={"submit": "submit", "tiny": id}) diff --git a/pyload/plugins/hoster/MegacrypterCom.py b/pyload/plugins/hoster/MegacrypterCom.py index f90174053..c166146dd 100644 --- a/pyload/plugins/hoster/MegacrypterCom.py +++ b/pyload/plugins/hoster/MegacrypterCom.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from module.common.json_layer import json +from module.common.json_layer import json_loads, json_dumps from module.plugins.hoster.MegaNz import MegaNz @@ -9,7 +9,7 @@ class MegacrypterCom(MegaNz): __name__ = "MegacrypterCom" __type__ = "hoster" __pattern__ = r"(https?://[a-z0-9]{0,10}\.?megacrypter\.com/[a-zA-Z0-9!_\-]+)" - __version__ = "0.1" + __version__ = "0.2" __description__ = """megacrypter plugin, based and inherits from RaNaN's MegaNz plugin""" __author_name__ = ("GonzaloSR", ) __author_mail__ = ("gonzalo@gonzalosr.com", ) @@ -19,10 +19,10 @@ class MegacrypterCom(MegaNz): def callApi(self, **kwargs): """ Dispatch a call to the api, see megacrypter.com/api_doc """ - self.logDebug("JSON request: " + json.dumps(kwargs)) - resp = self.load(self.API_URL, post=json.dumps(kwargs)) + self.logDebug("JSON request: " + json_dumps(kwargs)) + resp = self.load(self.API_URL, post=json_dumps(kwargs)) self.logDebug("API Response: " + resp) - return json.loads(resp) + return json_loads(resp) def process(self, pyfile): # match is guaranteed because plugin was chosen to handle url |