From 48c0c42fd6faffc56432d5f037cd575979f180cc Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 14 Jul 2014 02:23:37 +0200 Subject: Removed all @author flags + key attributes cleanup for internal & hooks plugins --- module/plugins/captcha/NetloadIn.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'module/plugins/captcha/NetloadIn.py') diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py index 733fe99db..9fb3b5c31 100644 --- a/module/plugins/captcha/NetloadIn.py +++ b/module/plugins/captcha/NetloadIn.py @@ -2,8 +2,17 @@ from captcha import OCR + class NetloadIn(OCR): __name__ = "NetloadIn" + __version__ = "0.1" + __type__ = "ocr" + + __description__ = """Netload.in ocr plugin""" + __author_name__ = "pyLoad Team" + __author_mail__ = "admin@pyload.org" + + def __init__(self): OCR.__init__(self) @@ -18,9 +27,10 @@ class NetloadIn(OCR): return self.result_captcha + if __name__ == '__main__': import urllib + ocr = NetloadIn() urllib.urlretrieve("http://netload.in/share/includes/captcha.php", "captcha.png") - - print ocr.get_captcha('captcha.png') + print ocr.get_captcha('captcha.png') -- cgit v1.2.3 From cedfbde86de423b8f004299af9f8ab60606cb790 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 20 Jul 2014 03:26:43 +0200 Subject: Remove testcodes in captcha plugins --- module/plugins/captcha/NetloadIn.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'module/plugins/captcha/NetloadIn.py') diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py index 9fb3b5c31..4585b51df 100644 --- a/module/plugins/captcha/NetloadIn.py +++ b/module/plugins/captcha/NetloadIn.py @@ -26,11 +26,3 @@ class NetloadIn(OCR): self.result_captcha = self.result_captcha.replace(" ", "")[:4] # cut to 4 numbers return self.result_captcha - - -if __name__ == '__main__': - import urllib - - ocr = NetloadIn() - urllib.urlretrieve("http://netload.in/share/includes/captcha.php", "captcha.png") - print ocr.get_captcha('captcha.png') -- cgit v1.2.3 From ba916633f2bedb04c7358000b91aed69f52e8e43 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 1 Aug 2014 19:35:59 +0200 Subject: Remove trailing whitespaces + remove license headers + import urllib methods directly + sort and fix key attributes + use save_join instead join + sort some import declarations + other minor code cosmetics --- module/plugins/captcha/NetloadIn.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/captcha/NetloadIn.py') diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py index 4585b51df..cb6cb9264 100644 --- a/module/plugins/captcha/NetloadIn.py +++ b/module/plugins/captcha/NetloadIn.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from captcha import OCR +from module.plugins.captcha import OCR class NetloadIn(OCR): __name__ = "NetloadIn" - __version__ = "0.1" __type__ = "ocr" + __version__ = "0.1" __description__ = """Netload.in ocr plugin""" __author_name__ = "pyLoad Team" -- cgit v1.2.3 From a74f7bb16a1419c6b8c37fc0d916c9f63a296235 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 2 Oct 2014 21:25:25 +0200 Subject: Fix captcha import of OCR class --- module/plugins/captcha/NetloadIn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/captcha/NetloadIn.py') diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py index cb6cb9264..d434ab4c2 100644 --- a/module/plugins/captcha/NetloadIn.py +++ b/module/plugins/captcha/NetloadIn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.captcha import OCR +from module.plugins.captcha.captcha import OCR class NetloadIn(OCR): -- cgit v1.2.3 From b0868ae6446078bacf1635dde5e4ab316b4a94cb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 18:57:59 +0200 Subject: New __authors__ key replaces __author_name__ and __author_mail__ + Whitespaces and EOF fixup --- module/plugins/captcha/NetloadIn.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'module/plugins/captcha/NetloadIn.py') diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py index d434ab4c2..3f5a7f2d7 100644 --- a/module/plugins/captcha/NetloadIn.py +++ b/module/plugins/captcha/NetloadIn.py @@ -9,8 +9,7 @@ class NetloadIn(OCR): __version__ = "0.1" __description__ = """Netload.in ocr plugin""" - __author_name__ = "pyLoad Team" - __author_mail__ = "admin@pyload.org" + __authors__ = [("pyLoad Team", "admin@pyload.org")] def __init__(self): -- cgit v1.2.3 From ae7a7e66981456e5bbe2b54006d79b6f907be7a4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 8 Oct 2014 20:18:13 +0200 Subject: Add __license__ key attribute to plugins --- module/plugins/captcha/NetloadIn.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/captcha/NetloadIn.py') diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py index 3f5a7f2d7..514cb259f 100644 --- a/module/plugins/captcha/NetloadIn.py +++ b/module/plugins/captcha/NetloadIn.py @@ -9,6 +9,7 @@ class NetloadIn(OCR): __version__ = "0.1" __description__ = """Netload.in ocr plugin""" + __license__ = "GPLv3" __authors__ = [("pyLoad Team", "admin@pyload.org")] -- cgit v1.2.3 From 0eb6e7ec4a1144dcca824d8add049787d3da1762 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 22 Oct 2014 19:44:59 +0200 Subject: Two space before function declaration --- module/plugins/captcha/NetloadIn.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/captcha/NetloadIn.py') diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py index 514cb259f..a8a05b210 100644 --- a/module/plugins/captcha/NetloadIn.py +++ b/module/plugins/captcha/NetloadIn.py @@ -16,6 +16,7 @@ class NetloadIn(OCR): def __init__(self): OCR.__init__(self) + def get_captcha(self, image): self.load_image(image) self.to_greyscale() -- cgit v1.2.3 From 34984dae733c3f3d47b41a0acfba3724d53c65a1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 28 Oct 2014 16:52:10 +0100 Subject: Code cosmetics: plugin class attributes --- module/plugins/captcha/NetloadIn.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/captcha/NetloadIn.py') diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py index a8a05b210..fc8eecf59 100644 --- a/module/plugins/captcha/NetloadIn.py +++ b/module/plugins/captcha/NetloadIn.py @@ -4,13 +4,13 @@ from module.plugins.captcha.captcha import OCR class NetloadIn(OCR): - __name__ = "NetloadIn" - __type__ = "ocr" + __name__ = "NetloadIn" + __type__ = "ocr" __version__ = "0.1" __description__ = """Netload.in ocr plugin""" - __license__ = "GPLv3" - __authors__ = [("pyLoad Team", "admin@pyload.org")] + __license__ = "GPLv3" + __authors__ = [("pyLoad Team", "admin@pyload.org")] def __init__(self): -- cgit v1.2.3 From 6151e81fa0b325dffda3da4228d5821e73db3ef3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 9 Dec 2014 01:19:46 +0100 Subject: Fix __version__ format in some plugins --- module/plugins/captcha/NetloadIn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/captcha/NetloadIn.py') diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py index fc8eecf59..28eb18fb5 100644 --- a/module/plugins/captcha/NetloadIn.py +++ b/module/plugins/captcha/NetloadIn.py @@ -6,7 +6,7 @@ from module.plugins.captcha.captcha import OCR class NetloadIn(OCR): __name__ = "NetloadIn" __type__ = "ocr" - __version__ = "0.1" + __version__ = "0.10" __description__ = """Netload.in ocr plugin""" __license__ = "GPLv3" -- cgit v1.2.3