Fix previous merging

28 files changed, 33 insertions, 96 deletions

diff --git a/module/plugins/accounts/BillionuploadsCom.py b/pyload/plugins/account/BillionuploadsCom.py
index 440c7889a..a8ad94bd3 100644
--- a/module/plugins/accounts/BillionuploadsCom.py
+++ b/pyload/plugins/account/BillionuploadsCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class BillionuploadsCom(XFSPAccount):
diff --git a/pyload/plugins/account/EasybytezCom.py b/pyload/plugins/account/EasybytezCom.py
index 0fcc187dc..bb4948811 100644
--- a/pyload/plugins/account/EasybytezCom.py
+++ b/pyload/plugins/account/EasybytezCom.py
@@ -4,7 +4,7 @@ import re
 
 from time import mktime, strptime, gmtime
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 from pyload.utils import parseFileSize
 
 
diff --git a/module/plugins/accounts/FileParadoxIn.py b/pyload/plugins/account/FileParadoxIn.py
index 24c745e6a..f36456da0 100644
--- a/module/plugins/accounts/FileParadoxIn.py
+++ b/pyload/plugins/account/FileParadoxIn.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class FileParadoxIn(XFSPAccount):
diff --git a/module/plugins/accounts/FileomCom.py b/pyload/plugins/account/FileomCom.py
index 536d40812..3ca32416d 100644
--- a/module/plugins/accounts/FileomCom.py
+++ b/pyload/plugins/account/FileomCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class FileomCom(XFSPAccount):
diff --git a/module/plugins/accounts/HugefilesNet.py b/pyload/plugins/account/HugefilesNet.py
index 296780b7c..d9828e333 100644
--- a/module/plugins/accounts/HugefilesNet.py
+++ b/pyload/plugins/account/HugefilesNet.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class HugefilesNet(XFSPAccount):
diff --git a/module/plugins/accounts/HundredEightyUploadCom.py b/pyload/plugins/account/HundredEightyUploadCom.py
index 76e757222..77768fbef 100644
--- a/module/plugins/accounts/HundredEightyUploadCom.py
+++ b/pyload/plugins/account/HundredEightyUploadCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class HundredEightyUploadCom(XFSPAccount):
diff --git a/module/plugins/accounts/LomafileCom.py b/pyload/plugins/account/LomafileCom.py
index bddccdadc..b1faf3bf6 100644
--- a/module/plugins/accounts/LomafileCom.py
+++ b/pyload/plugins/account/LomafileCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class LomafileCom(XFSPAccount):
diff --git a/module/plugins/accounts/NosuploadCom.py b/pyload/plugins/account/NosuploadCom.py
index a75ca289f..b02ae50e8 100644
--- a/module/plugins/accounts/NosuploadCom.py
+++ b/pyload/plugins/account/NosuploadCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class NosuploadCom(XFSPAccount):
diff --git a/module/plugins/accounts/NovafileCom.py b/pyload/plugins/account/NovafileCom.py
index 34d3e25b5..fa5e28946 100644
--- a/module/plugins/accounts/NovafileCom.py
+++ b/pyload/plugins/account/NovafileCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class NovafileCom(XFSPAccount):
diff --git a/module/plugins/accounts/SecureUploadEu.py b/pyload/plugins/account/SecureUploadEu.py
index a8cf38df2..efcfabba0 100644
--- a/module/plugins/accounts/SecureUploadEu.py
+++ b/pyload/plugins/account/SecureUploadEu.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class SecureUploadEu(XFSPAccount):
diff --git a/module/plugins/accounts/SendmywayCom.py b/pyload/plugins/account/SendmywayCom.py
index 9f6021774..5a169dcc0 100644
--- a/module/plugins/accounts/SendmywayCom.py
+++ b/pyload/plugins/account/SendmywayCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class SendmywayCom(XFSPAccount):
diff --git a/module/plugins/accounts/StreamcloudEu.py b/pyload/plugins/account/StreamcloudEu.py
index 4a544b691..78d4179bf 100644
--- a/module/plugins/accounts/StreamcloudEu.py
+++ b/pyload/plugins/account/StreamcloudEu.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class StreamcloudEu(XFSPAccount):
diff --git a/pyload/plugins/account/TusfilesNet.py b/pyload/plugins/account/TusfilesNet.py
index 6a80105be..36110fca7 100644
--- a/pyload/plugins/account/TusfilesNet.py
+++ b/pyload/plugins/account/TusfilesNet.py
@@ -4,7 +4,7 @@ import re
 
 from time import mktime, strptime, gmtime
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 from pyload.utils import parseFileSize
 
 
diff --git a/module/plugins/accounts/VidPlayNet.py b/pyload/plugins/account/VidPlayNet.py
index 4c542024e..a7e71365e 100644
--- a/module/plugins/accounts/VidPlayNet.py
+++ b/pyload/plugins/account/VidPlayNet.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class VidPlayNet(XFSPAccount):
diff --git a/pyload/plugins/base/Addon.py b/pyload/plugins/base/Addon.py
index 3cc152666..2dfeba83c 100644
--- a/pyload/plugins/base/Addon.py
+++ b/pyload/plugins/base/Addon.py
@@ -31,8 +31,9 @@ class Addon(Base):
     __config__ = [("name", "type", "desc", "default")]
 
     __description__ = """Interface for addon"""
-    __author_name__ = ("mkaay", "RaNaN")
-    __author_mail__ = ("mkaay@mkaay.de", "RaNaN@pyload.org")
+    __authors__ = [("mkaay", "mkaay@mkaay.de"),
+                   ("RaNaN", "RaNaN@pyload.org")]
+
 
     #: automatically register event listeners for functions, attribute will be deleted dont use it yourself
     event_map = None
diff --git a/pyload/plugins/base/Captcha.py b/pyload/plugins/base/Captcha.py
index 4aafedd5f..86b073710 100644
--- a/pyload/plugins/base/Captcha.py
+++ b/pyload/plugins/base/Captcha.py
@@ -10,13 +10,13 @@ class Captcha(Plugin):
     __version__ = "0.09"
 
     __description__ = """Base captcha service plugin"""
-    __author_name__ = "pyLoad Team"
-    __author_mail__ = "admin@pyload.org"
+    __authors__ = [("pyLoad Team", "admin@pyload.org")]
 
-    KEY_PATTERN = None
 
     key = None
 
+    KEY_PATTERN = None
+
 
     def __init__(self, plugin):
         self.plugin = plugin
@@ -47,64 +47,3 @@ class Captcha(Plugin):
 
     def result(self, server, challenge):
         raise NotImplementedError
-
-
-class ReCaptcha(CaptchaService):
-    __name__ = "ReCaptcha"
-    __version__ = "0.02"
-
-    __description__ = """ReCaptcha captcha service plugin"""
-    __author_name__ = "pyLoad Team"
-    __author_mail__ = "admin@pyload.org"
-
-
-    KEY_PATTERN = r"https?://(?:www\.)?google\.com/recaptcha/api/challenge\?k=(?P<KEY>\w+?)"
-    KEY_AJAX_PATTERN = r"Recaptcha\.create\s*\(\s*[\"'](?P<KEY>\w+)[\"']\s*,"
-
-
-    def detect_key(self, html=None):
-        if not html:
-            if hasattr(self.plugin, "html") and self.plugin.html:
-                html = self.plugin.html
-            else:
-                errmsg = "ReCaptcha html missing"
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
-
-        m = re.search(self.KEY_PATTERN, html)
-        if m is None:
-            m = re.search(self.KEY_AJAX_PATTERN, html)
-        if m:
-            self.key = m.group("KEY")
-            self.plugin.logDebug("ReCaptcha key: %s" % self.key)
-            return self.key
-        else:
-            self.plugin.logDebug("ReCaptcha key not found")
-            return None
-
-
-    def challenge(self, key=None):
-        if not key:
-            if self.key:
-                key = self.key
-            else:
-                errmsg = "ReCaptcha key missing"
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
-
-        js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={'k': key}, cookies=True)
-
-        try:
-            challenge = re.search("challenge : '(.+?)',", js).group(1)
-            server = re.search("server : '(.+?)',", js).group(1)
-        except:
-            self.plugin.parseError("ReCaptcha challenge pattern not found")
-
-        result = self.result(server, challenge)
-
-        return challenge, result
-
-
-    def result(self, server, challenge):
-        return self.plugin.decryptCaptcha("%simage" % server, get={'c': challenge},
-                                          cookies=True, forceUser=True, imgtype="jpg")
diff --git a/pyload/plugins/captcha/AdsCaptcha.py b/pyload/plugins/captcha/AdsCaptcha.py
index 277adf3cf..8d4e12e28 100644
--- a/pyload/plugins/captcha/AdsCaptcha.py
+++ b/pyload/plugins/captcha/AdsCaptcha.py
@@ -12,8 +12,7 @@ class AdsCaptcha(Captcha):
     __version__ = "0.02"
 
     __description__ = """AdsCaptcha captcha service plugin"""
-    __author_name__ = "pyLoad Team"
-    __author_mail__ = "admin@pyload.org"
+    __authors__ = [("pyLoad Team", "admin@pyload.org")]
 
 
     ID_PATTERN = r'http://api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(?P<ID>\d+)'
diff --git a/pyload/plugins/captcha/ReCaptcha.py b/pyload/plugins/captcha/ReCaptcha.py
index 841629e9d..445f6b361 100644
--- a/pyload/plugins/captcha/ReCaptcha.py
+++ b/pyload/plugins/captcha/ReCaptcha.py
@@ -10,8 +10,7 @@ class ReCaptcha(Captcha):
     __version__ = "0.02"
 
     __description__ = """ReCaptcha captcha service plugin"""
-    __author_name__ = "pyLoad Team"
-    __author_mail__ = "admin@pyload.org"
+    __authors__ = [("pyLoad Team", "admin@pyload.org")]
 
 
     KEY_PATTERN = r"https?://(?:www\.)?google\.com/recaptcha/api/challenge\?k=(?P<KEY>\w+?)"
diff --git a/pyload/plugins/captcha/SolveMedia.py b/pyload/plugins/captcha/SolveMedia.py
index c1855cdfe..c8e87bb7a 100644
--- a/pyload/plugins/captcha/SolveMedia.py
+++ b/pyload/plugins/captcha/SolveMedia.py
@@ -10,8 +10,7 @@ class SolveMedia(Captcha):
     __version__ = "0.02"
 
     __description__ = """SolveMedia captcha service plugin"""
-    __author_name__ = "pyLoad Team"
-    __author_mail__ = "admin@pyload.org"
+    __authors__ = [("pyLoad Team", "admin@pyload.org")]
 
 
     KEY_PATTERN = r'http://api\.solvemedia\.com/papi/challenge\.(no)?script\?k=(?P<KEY>.+?)"'
diff --git a/pyload/plugins/hoster/DuploadOrg.py b/pyload/plugins/hoster/DuploadOrg.py
index 02df654c2..213fb717a 100644
--- a/pyload/plugins/hoster/DuploadOrg.py
+++ b/pyload/plugins/hoster/DuploadOrg.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class DuploadOrg(DeadHoster):
diff --git a/pyload/plugins/hoster/EpicShareNet.py b/pyload/plugins/hoster/EpicShareNet.py
index f0fe766f5..75f35646e 100644
--- a/pyload/plugins/hoster/EpicShareNet.py
+++ b/pyload/plugins/hoster/EpicShareNet.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class EpicShareNet(DeadHoster):
diff --git a/module/plugins/hoster/FilepupNet.py b/pyload/plugins/hoster/FilepupNet.py
index 12b2f7798..6c2437f67 100644
--- a/module/plugins/hoster/FilepupNet.py
+++ b/pyload/plugins/hoster/FilepupNet.py
@@ -6,7 +6,7 @@
 
 import re
 
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class FilepupNet(SimpleHoster):
diff --git a/pyload/plugins/hoster/LemUploadsCom.py b/pyload/plugins/hoster/LemUploadsCom.py
index 2c77f3106..62da76783 100644
--- a/pyload/plugins/hoster/LemUploadsCom.py
+++ b/pyload/plugins/hoster/LemUploadsCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class LemUploadsCom(DeadHoster):
diff --git a/pyload/plugins/hoster/LomafileCom.py b/pyload/plugins/hoster/LomafileCom.py
index 8184e9393..a7f14b179 100644
--- a/pyload/plugins/hoster/LomafileCom.py
+++ b/pyload/plugins/hoster/LomafileCom.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+from pyload.plugins.internal.XFileSharingPro import XFSPHoster, create_getInfo
 
 
-class LomafileCom(XFileSharingPro):
+class LomafileCom(XFSPHoster):
     __name__ = "LomafileCom"
     __type__ = "hoster"
     __version__ = "0.3"
diff --git a/pyload/plugins/hoster/MegaFilesSe.py b/pyload/plugins/hoster/MegaFilesSe.py
index e5b10f6e1..448e49802 100644
--- a/pyload/plugins/hoster/MegaFilesSe.py
+++ b/pyload/plugins/hoster/MegaFilesSe.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class MegaFilesSe(DeadHoster):
diff --git a/pyload/plugins/hoster/MegareleaseOrg.py b/pyload/plugins/hoster/MegareleaseOrg.py
index b627a8f10..5dd27b5b2 100644
--- a/pyload/plugins/hoster/MegareleaseOrg.py
+++ b/pyload/plugins/hoster/MegareleaseOrg.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class MegareleaseOrg(DeadHoster):
diff --git a/module/plugins/hoster/PandaPlaNet.py b/pyload/plugins/hoster/PandaPlaNet.py
index 9473726fa..fed55d278 100644
--- a/module/plugins/hoster/PandaPlaNet.py
+++ b/pyload/plugins/hoster/PandaPlaNet.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class PandaPlaNet(DeadHoster):
diff --git a/pyload/plugins/hoster/PotloadCom.py b/pyload/plugins/hoster/PotloadCom.py
index ce5f832a1..39f76a923 100644
--- a/pyload/plugins/hoster/PotloadCom.py
+++ b/pyload/plugins/hoster/PotloadCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class PotloadCom(DeadHoster):