summaryrefslogtreecommitdiffstats
path: root/module/plugins/captcha
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/captcha')
-rw-r--r--module/plugins/captcha/AdYouLike.py12
-rw-r--r--module/plugins/captcha/AdsCaptcha.py2
-rw-r--r--module/plugins/captcha/CircleCaptcha.py22
-rw-r--r--module/plugins/captcha/GigasizeCom.py2
-rw-r--r--module/plugins/captcha/LinksaveIn.py2
-rw-r--r--module/plugins/captcha/NetloadIn.py2
-rw-r--r--module/plugins/captcha/ReCaptcha.py2
-rw-r--r--module/plugins/captcha/ShareonlineBiz.py2
-rw-r--r--module/plugins/captcha/SolveMedia.py2
9 files changed, 24 insertions, 24 deletions
diff --git a/module/plugins/captcha/AdYouLike.py b/module/plugins/captcha/AdYouLike.py
index b10d2c399..c374c5bcf 100644
--- a/module/plugins/captcha/AdYouLike.py
+++ b/module/plugins/captcha/AdYouLike.py
@@ -2,14 +2,14 @@
import re
-from module.common.json_layer import json_loads
+from module.plugins.internal.utils import json
from module.plugins.internal.CaptchaService import CaptchaService
class AdYouLike(CaptchaService):
__name__ = "AdYouLike"
__type__ = "captcha"
- __version__ = "0.07"
+ __version__ = "0.08"
__status__ = "testing"
__description__ = """AdYouLike captcha service plugin"""
@@ -40,14 +40,14 @@ class AdYouLike(CaptchaService):
#: {'adyoulike':{'key':"P~zQ~O0zV0WTiAzC-iw0navWQpCLoYEP"},
#: 'all':{'element_id':"ayl_private_cap_92300",'lang':"fr",'env':"prod"}}
- ayl = json_loads(ayl)
+ ayl = json.loads(ayl)
html = self.plugin.load("http://api-ayl.appspot.com/challenge",
get={'key' : ayl['adyoulike']['key'],
'env' : ayl['all']['env'],
'callback': callback})
try:
- challenge = json_loads(re.search(callback + r'\s*\((.+?)\)', html).group(1))
+ challenge = json.loads(re.search(callback + r'\s*\((.+?)\)', html).group(1))
except AttributeError:
self.fail(_("AdYouLike challenge pattern not found"))
@@ -69,10 +69,10 @@ class AdYouLike(CaptchaService):
#: 'tid':"SqwuAdxT1EZoi4B5q0T63LN2AkiCJBg5"})
if isinstance(server, basestring):
- server = json_loads(server)
+ server = json.loads(server)
if isinstance(challenge, basestring):
- challenge = json_loads(challenge)
+ challenge = json.loads(challenge)
try:
instructions_visual = challenge['translations'][server['all']['lang']]['instructions_visual']
diff --git a/module/plugins/captcha/AdsCaptcha.py b/module/plugins/captcha/AdsCaptcha.py
index 7dc51565f..e8c578e96 100644
--- a/module/plugins/captcha/AdsCaptcha.py
+++ b/module/plugins/captcha/AdsCaptcha.py
@@ -9,7 +9,7 @@ from module.plugins.internal.CaptchaService import CaptchaService
class AdsCaptcha(CaptchaService):
__name__ = "AdsCaptcha"
__type__ = "captcha"
- __version__ = "0.10"
+ __version__ = "0.11"
__status__ = "testing"
__description__ = """AdsCaptcha captcha service plugin"""
diff --git a/module/plugins/captcha/CircleCaptcha.py b/module/plugins/captcha/CircleCaptcha.py
index dc04a04c8..98e54e5ed 100644
--- a/module/plugins/captcha/CircleCaptcha.py
+++ b/module/plugins/captcha/CircleCaptcha.py
@@ -31,7 +31,7 @@ class ImageSequence:
class CircleCaptcha(OCR):
__name__ = "CircleCaptcha"
__type__ = "ocr"
- __version__ = "1.04"
+ __version__ = "1.05"
__status__ = "testing"
__description__ = """Circle captcha ocr plugin"""
@@ -474,15 +474,15 @@ class CircleCaptcha(OCR):
#: Assial Simmetric
if self.pyload.debug:
- self.log_debug("Center: " + str(c),
- "Missing: " + str(missing),
- "Howmany: " + str(howmany),
- "Ratio: " + str(missing / howmany),
- "Missing consecutives: " + str(missingconsecutive),
- "Missing X lenght: " + str(minX) + ":" + str(maxX),
- "Missing Y lenght: " + str(minY) + ":" + str(maxY),
- "Ratio without consecutives: " + str((missing - missingconsecutive) / howmany),
- "List missing: " + str(missinglist))
+ self.log_debug("Center: %s" % c,
+ "Missing: %s" % missing,
+ "Howmany: %s" % howmany,
+ "Ratio: %s" % (missing / howmany),
+ "Missing consecutives: %s" % missingconsecutive,
+ "Missing X lenght: %s:%s" % (minX, maxX),
+ "Missing Y lenght: %s:%s" % (minY, maxY),
+ "Ratio without consecutives: %s" % ((missing - missingconsecutive) / howmany),
+ "List missing: %s" % missinglist)
#: Lenght of missing cannot be over 75% of diameter
@@ -711,7 +711,7 @@ class CircleCaptcha(OCR):
break
if self.pyload.debug:
- self.log_debug('Howmany opened circle? ' + str(len(found)) + ' ' + str(found))
+ self.log_debug("Howmany opened circle?", found)
#: Clean results
for c in found:
diff --git a/module/plugins/captcha/GigasizeCom.py b/module/plugins/captcha/GigasizeCom.py
index 12f123c41..bcaceee03 100644
--- a/module/plugins/captcha/GigasizeCom.py
+++ b/module/plugins/captcha/GigasizeCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.OCR import OCR
class GigasizeCom(OCR):
__name__ = "GigasizeCom"
__type__ = "ocr"
- __version__ = "0.14"
+ __version__ = "0.15"
__status__ = "testing"
__description__ = """Gigasize.com ocr plugin"""
diff --git a/module/plugins/captcha/LinksaveIn.py b/module/plugins/captcha/LinksaveIn.py
index a9ccecf3c..283d9f6eb 100644
--- a/module/plugins/captcha/LinksaveIn.py
+++ b/module/plugins/captcha/LinksaveIn.py
@@ -15,7 +15,7 @@ from module.plugins.internal.OCR import OCR
class LinksaveIn(OCR):
__name__ = "LinksaveIn"
__type__ = "ocr"
- __version__ = "0.14"
+ __version__ = "0.15"
__status__ = "testing"
__description__ = """Linksave.in ocr plugin"""
diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py
index 50174684d..a7b2131c1 100644
--- a/module/plugins/captcha/NetloadIn.py
+++ b/module/plugins/captcha/NetloadIn.py
@@ -6,7 +6,7 @@ from module.plugins.internal.OCR import OCR
class NetloadIn(OCR):
__name__ = "NetloadIn"
__type__ = "ocr"
- __version__ = "0.14"
+ __version__ = "0.15"
__status__ = "testing"
__description__ = """Netload.in ocr plugin"""
diff --git a/module/plugins/captcha/ReCaptcha.py b/module/plugins/captcha/ReCaptcha.py
index 379956be6..e2bd5e8ca 100644
--- a/module/plugins/captcha/ReCaptcha.py
+++ b/module/plugins/captcha/ReCaptcha.py
@@ -13,7 +13,7 @@ from module.plugins.internal.CaptchaService import CaptchaService
class ReCaptcha(CaptchaService):
__name__ = "ReCaptcha"
__type__ = "captcha"
- __version__ = "0.18"
+ __version__ = "0.19"
__status__ = "testing"
__description__ = """ReCaptcha captcha service plugin"""
diff --git a/module/plugins/captcha/ShareonlineBiz.py b/module/plugins/captcha/ShareonlineBiz.py
index 19db6c4cd..da36fa910 100644
--- a/module/plugins/captcha/ShareonlineBiz.py
+++ b/module/plugins/captcha/ShareonlineBiz.py
@@ -6,7 +6,7 @@ from module.plugins.internal.OCR import OCR
class ShareonlineBiz(OCR):
__name__ = "ShareonlineBiz"
__type__ = "ocr"
- __version__ = "0.14"
+ __version__ = "0.15"
__status__ = "testing"
__description__ = """Shareonline.biz ocr plugin"""
diff --git a/module/plugins/captcha/SolveMedia.py b/module/plugins/captcha/SolveMedia.py
index 6629656b2..7acb7d85d 100644
--- a/module/plugins/captcha/SolveMedia.py
+++ b/module/plugins/captcha/SolveMedia.py
@@ -9,7 +9,7 @@ from module.plugins.internal.CaptchaService import CaptchaService
class SolveMedia(CaptchaService):
__name__ = "SolveMedia"
__type__ = "captcha"
- __version__ = "0.15"
+ __version__ = "0.16"
__status__ = "testing"
__description__ = """SolveMedia captcha service plugin"""
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 20:15:09 +0100