summaryrefslogtreecommitdiffstats
path: root/pyload/plugin/hoster/FilerNet.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-04-12 19:23:51 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-04-12 19:23:51 +0200
commitf0afbee15380bf5fc242fb3dd5439a9ea9c67d5c (patch)
tree7e82c022c157a39232fc590ab2ffa69787f5d260 /pyload/plugin/hoster/FilerNet.py
parentCleanup (diff)
parentimport fixes + code-cleanup (diff)
downloadpyload-f0afbee15380bf5fc242fb3dd5439a9ea9c67d5c.tar.xz
Merge branch 'pr/n3_ardi69' into 0.4.10
Conflicts: pyload/plugin/Plugin.py pyload/webui/app/pyloadweb.py
Diffstat (limited to 'pyload/plugin/hoster/FilerNet.py')
-rw-r--r--pyload/plugin/hoster/FilerNet.py10
1 files changed, 4 insertions, 6 deletions
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():