15 files changed, 18 insertions, 20 deletions
diff --git a/pyload/plugin/hoster/BitshareCom.py b/pyload/plugin/hoster/BitshareCom.py
index f4be88401..ef65b1b80 100644
--- a/pyload/plugin/hoster/BitshareCom.py
+++ b/pyload/plugin/hoster/BitshareCom.py
@@ -4,7 +4,7 @@ from __future__ import with_statement
 
 import re
 
-from pyload.plugin.internal.captcha import ReCaptcha
+from pyload.plugin.captcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/CatShareNet.py b/pyload/plugin/hoster/CatShareNet.py
index 0aca297b8..08666e573 100644
--- a/pyload/plugin/hoster/CatShareNet.py
+++ b/pyload/plugin/hoster/CatShareNet.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.plugin.internal.captcha import ReCaptcha
+from pyload.plugin.captcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/CrockoCom.py b/pyload/plugin/hoster/CrockoCom.py
index 55bb126cd..b2748f6b1 100644
--- a/pyload/plugin/hoster/CrockoCom.py
+++ b/pyload/plugin/hoster/CrockoCom.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.plugin.internal.captcha import ReCaptcha
+from pyload.plugin.captcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/DateiTo.py b/pyload/plugin/hoster/DateiTo.py
index 6c160dfb9..c91557747 100644
--- a/pyload/plugin/hoster/DateiTo.py
+++ b/pyload/plugin/hoster/DateiTo.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.plugin.internal.captcha import ReCaptcha
+from pyload.plugin.captcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/DepositfilesCom.py b/pyload/plugin/hoster/DepositfilesCom.py
index 736350f0c..7dfd9dd5e 100644
--- a/pyload/plugin/hoster/DepositfilesCom.py
+++ b/pyload/plugin/hoster/DepositfilesCom.py
@@ -4,7 +4,7 @@ import re
 
 from urllib import unquote
 
-from pyload.plugin.internal.captcha import ReCaptcha
+from pyload.plugin.captcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/DlFreeFr.py b/pyload/plugin/hoster/DlFreeFr.py
index 83e7c5d77..127462d61 100644
--- a/pyload/plugin/hoster/DlFreeFr.py
+++ b/pyload/plugin/hoster/DlFreeFr.py
@@ -5,7 +5,7 @@ import re
 
 from pyload.network.Browser import Browser
 from pyload.network.CookieJar import CookieJar
-from pyload.plugin.internal.captcha import AdYouLike
+from pyload.plugin.captcha import AdYouLike
 from pyload.plugin.internal.SimpleHoster import SimpleHoster, replace_patterns
 from pyload.utils import json_loads
 
diff --git a/pyload/plugin/hoster/FilecloudIo.py b/pyload/plugin/hoster/FilecloudIo.py
index 07a743292..33256b6a8 100644
--- a/pyload/plugin/hoster/FilecloudIo.py
+++ b/pyload/plugin/hoster/FilecloudIo.py
@@ -3,7 +3,7 @@
 import re
 
 from pyload.utils import json_loads
-from pyload.plugin.internal.captcha import ReCaptcha
+from pyload.plugin.captcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/FilepostCom.py b/pyload/plugin/hoster/FilepostCom.py
index 883c001ab..a32b46fbb 100644
--- a/pyload/plugin/hoster/FilepostCom.py
+++ b/pyload/plugin/hoster/FilepostCom.py
@@ -4,7 +4,7 @@ import re
 import time
 
 from pyload.utils import json_loads
-from pyload.plugin.internal.captcha import ReCaptcha
+from pyload.plugin.captcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/FilerNet.py b/pyload/plugin/hoster/FilerNet.py
index 3138780e4..7cefa6d9f 100644
--- a/pyload/plugin/hoster/FilerNet.py
+++ b/pyload/plugin/hoster/FilerNet.py
@@ -9,7 +9,7 @@ import re
 
 from urlparse import urljoin
 
-from pyload.plugin.internal.captcha import ReCaptcha
+from pyload.plugin.captcha.ReCaptcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
@@ -24,8 +24,7 @@ class FilerNet(SimpleHoster):
     __description = """Filer.net hoster plugin"""
     __license     = "GPLv3"
     __authors     = [("stickell", "l.stickell@yahoo.it"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
-
+                     ("Walter Purcaro", "vuolter@gmail.com")]
 
     INFO_PATTERN    = r'<h1 class="page-header">Free Download (?P<N>\S+) <small>(?P<S>[\w.]+) (?P<U>[\w^_]+)</small></h1>'
     OFFLINE_PATTERN = r'Nicht gefunden'
@@ -34,7 +33,6 @@ class FilerNet(SimpleHoster):
 
     LINK_FREE_PATTERN = LINK_PREMIUM_PATTERN = r'href="([^"]+)">Get download</a>'
 
-
     def handleFree(self, pyfile):
         inputs = self.parseHtmlForm(input_names={'token': re.compile(r'.+')})[1]
         if 'token' not in inputs:
@@ -53,8 +51,8 @@ class FilerNet(SimpleHoster):
         #@TODO: Check for v0.4.10
         self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 0)
         self.load(pyfile.url, post={'recaptcha_challenge_field': challenge,
-                                    'recaptcha_response_field' : response,
-                                    'hash'                     : inputs['hash']})
+                                    'recaptcha_response_field': response,
+                                    'hash': inputs['hash']})
         self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 1)
 
         if 'location' in self.req.http.header.lower():
diff --git a/pyload/plugin/hoster/KingfilesNet.py b/pyload/plugin/hoster/KingfilesNet.py
index a47defebc..92942fbeb 100644
--- a/pyload/plugin/hoster/KingfilesNet.py
+++ b/pyload/plugin/hoster/KingfilesNet.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.plugin.internal.captcha import SolveMedia
+from pyload.plugin.captcha import SolveMedia
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/LoadTo.py b/pyload/plugin/hoster/LoadTo.py
index 6616114e3..2c34b7c03 100644
--- a/pyload/plugin/hoster/LoadTo.py
+++ b/pyload/plugin/hoster/LoadTo.py
@@ -6,7 +6,7 @@
 
 import re
 
-from pyload.plugin.internal.captcha import SolveMedia
+from pyload.plugin.captcha import SolveMedia
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/LuckyShareNet.py b/pyload/plugin/hoster/LuckyShareNet.py
index 3300f989c..b23428938 100644
--- a/pyload/plugin/hoster/LuckyShareNet.py
+++ b/pyload/plugin/hoster/LuckyShareNet.py
@@ -4,7 +4,7 @@ import re
 
 from bottle import json_loads
 
-from pyload.plugin.internal.captcha import ReCaptcha
+from pyload.plugin.captcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/OboomCom.py b/pyload/plugin/hoster/OboomCom.py
index f8a9fb8bb..c24e4c9ab 100644
--- a/pyload/plugin/hoster/OboomCom.py
+++ b/pyload/plugin/hoster/OboomCom.py
@@ -7,7 +7,7 @@ import re
 
 from pyload.utils import json_loads
 from pyload.plugin.Hoster import Hoster
-from pyload.plugin.internal.captcha import ReCaptcha
+from pyload.plugin.captcha import ReCaptcha
 
 
 class OboomCom(Hoster):
diff --git a/pyload/plugin/hoster/TurbobitNet.py b/pyload/plugin/hoster/TurbobitNet.py
index d8daf79f7..af28f7d74 100644
--- a/pyload/plugin/hoster/TurbobitNet.py
+++ b/pyload/plugin/hoster/TurbobitNet.py
@@ -10,7 +10,7 @@ from pycurl import HTTPHEADER
 from urllib import quote
 
 from pyload.network.RequestFactory import getURL
-from pyload.plugin.internal.captcha import ReCaptcha
+from pyload.plugin.captcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster, timestamp
 
 
diff --git a/pyload/plugin/hoster/UpstoreNet.py b/pyload/plugin/hoster/UpstoreNet.py
index f022ef2dd..dcbf7ea9e 100644
--- a/pyload/plugin/hoster/UpstoreNet.py
+++ b/pyload/plugin/hoster/UpstoreNet.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.plugin.internal.captcha import ReCaptcha
+from pyload.plugin.captcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster