summaryrefslogtreecommitdiffstats
path: root/module/plugins/internal
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-09-30 00:44:55 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-09-30 00:44:55 +0200
commitc3b6253f1ea9b8c4a5aeb2c2c0be292f66a2abee (patch)
tree074493704fe976dacaacbd4f0a91d3596f0a48ee /module/plugins/internal
parentMerge pull request #1882 from GammaC0de/patch-5 (diff)
downloadpyload-c3b6253f1ea9b8c4a5aeb2c2c0be292f66a2abee.tar.xz
[Captcha] _decrypt -> decrypt_image
Diffstat (limited to 'module/plugins/internal')
-rw-r--r--module/plugins/internal/Captcha.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/module/plugins/internal/Captcha.py b/module/plugins/internal/Captcha.py
index 93642b32a..3d105ed12 100644
--- a/module/plugins/internal/Captcha.py
+++ b/module/plugins/internal/Captcha.py
@@ -11,7 +11,7 @@ from module.plugins.internal.Plugin import Plugin
class Captcha(Plugin):
__name__ = "Captcha"
__type__ = "captcha"
- __version__ = "0.45"
+ __version__ = "0.46"
__status__ = "testing"
__description__ = """Base anti-captcha plugin"""
@@ -52,11 +52,10 @@ class Captcha(Plugin):
def decrypt(self, url, get={}, post={}, ref=False, cookies=True, decode=False, req=None,
input_type='jpg', output_type='textual', ocr=True, timeout=120):
img = self.load(url, get=get, post=post, ref=ref, cookies=cookies, decode=decode, req=req or self.plugin.req)
- return self._decrypt(img, input_type, output_type, ocr, timeout)
+ return self.decrypt_image(img, input_type, output_type, ocr, timeout)
- #@TODO: Definitely choose a better name for this method!
- def _decrypt(self, data, input_type='jpg', output_type='textual', ocr=False, timeout=120):
+ def decrypt_image(self, data, input_type='jpg', output_type='textual', ocr=False, timeout=120):
"""
Loads a captcha and decrypts it with ocr, plugin, user input