diff options
Diffstat (limited to 'pyload/plugin/hoster')
-rw-r--r-- | pyload/plugin/hoster/BitshareCom.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/CatShareNet.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/CrockoCom.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/DateiTo.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/DepositfilesCom.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/DlFreeFr.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/FilecloudIo.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/FilepostCom.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/KingfilesNet.py | 7 | ||||
-rw-r--r-- | pyload/plugin/hoster/LoadTo.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/LuckyShareNet.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/NetloadIn.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/OboomCom.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/RapiduNet.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/ShareonlineBiz.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/TurbobitNet.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/UploadableCh.py | 2 | ||||
-rw-r--r-- | pyload/plugin/hoster/UpstoreNet.py | 2 |
18 files changed, 19 insertions, 22 deletions
diff --git a/pyload/plugin/hoster/BitshareCom.py b/pyload/plugin/hoster/BitshareCom.py index ef65b1b80..471951a9e 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.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugin/hoster/CatShareNet.py b/pyload/plugin/hoster/CatShareNet.py index 08666e573..f60208cc4 100644 --- a/pyload/plugin/hoster/CatShareNet.py +++ b/pyload/plugin/hoster/CatShareNet.py @@ -2,7 +2,7 @@ import re -from pyload.plugin.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugin/hoster/CrockoCom.py b/pyload/plugin/hoster/CrockoCom.py index b2748f6b1..4bf549574 100644 --- a/pyload/plugin/hoster/CrockoCom.py +++ b/pyload/plugin/hoster/CrockoCom.py @@ -2,7 +2,7 @@ import re -from pyload.plugin.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugin/hoster/DateiTo.py b/pyload/plugin/hoster/DateiTo.py index c91557747..251036ad2 100644 --- a/pyload/plugin/hoster/DateiTo.py +++ b/pyload/plugin/hoster/DateiTo.py @@ -2,7 +2,7 @@ import re -from pyload.plugin.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugin/hoster/DepositfilesCom.py b/pyload/plugin/hoster/DepositfilesCom.py index 7dfd9dd5e..451adbdc0 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.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugin/hoster/DlFreeFr.py b/pyload/plugin/hoster/DlFreeFr.py index 127462d61..568b6dfce 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.captcha import AdYouLike +from pyload.plugin.captcha.AdYouLike 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 33256b6a8..2cbc472de 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.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugin/hoster/FilepostCom.py b/pyload/plugin/hoster/FilepostCom.py index a32b46fbb..c5cfa1521 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.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugin/hoster/KingfilesNet.py b/pyload/plugin/hoster/KingfilesNet.py index 92942fbeb..af1d49390 100644 --- a/pyload/plugin/hoster/KingfilesNet.py +++ b/pyload/plugin/hoster/KingfilesNet.py @@ -2,7 +2,7 @@ import re -from pyload.plugin.captcha import SolveMedia +from pyload.plugin.captcha.SolveMedia import SolveMedia from pyload.plugin.internal.SimpleHoster import SimpleHoster @@ -17,8 +17,7 @@ class KingfilesNet(SimpleHoster): __description = """Kingfiles.net hoster plugin""" __license = "GPLv3" __authors = [("zapp-brannigan", "fuerst.reinje@web.de"), - ("Walter Purcaro", "vuolter@gmail.com")] - + ("Walter Purcaro", "vuolter@gmail.com")] NAME_PATTERN = r'name="fname" value="(?P<N>.+?)">' SIZE_PATTERN = r'>Size: .+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)' @@ -29,12 +28,10 @@ class KingfilesNet(SimpleHoster): LINK_FREE_PATTERN = r'var download_url = \'(.+)\';' - def setup(self): self.resumeDownload = True self.multiDL = True - def handleFree(self, pyfile): # Click the free user button post_data = {'op' : "download1", diff --git a/pyload/plugin/hoster/LoadTo.py b/pyload/plugin/hoster/LoadTo.py index 2c34b7c03..a0e4eb92e 100644 --- a/pyload/plugin/hoster/LoadTo.py +++ b/pyload/plugin/hoster/LoadTo.py @@ -6,7 +6,7 @@ import re -from pyload.plugin.captcha import SolveMedia +from pyload.plugin.captcha.SolveMedia import SolveMedia from pyload.plugin.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugin/hoster/LuckyShareNet.py b/pyload/plugin/hoster/LuckyShareNet.py index b23428938..7fbbbf1ea 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.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugin/hoster/NetloadIn.py b/pyload/plugin/hoster/NetloadIn.py index 5a982a055..dcfb9dcb6 100644 --- a/pyload/plugin/hoster/NetloadIn.py +++ b/pyload/plugin/hoster/NetloadIn.py @@ -8,7 +8,7 @@ from urlparse import urljoin from pyload.network.RequestFactory import getURL from pyload.plugin.Hoster import Hoster from pyload.plugin.Plugin import chunks -from pyload.plugin.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha def getInfo(urls): diff --git a/pyload/plugin/hoster/OboomCom.py b/pyload/plugin/hoster/OboomCom.py index c24e4c9ab..07c40a397 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.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha class OboomCom(Hoster): diff --git a/pyload/plugin/hoster/RapiduNet.py b/pyload/plugin/hoster/RapiduNet.py index 858e5fd09..4a7be110c 100644 --- a/pyload/plugin/hoster/RapiduNet.py +++ b/pyload/plugin/hoster/RapiduNet.py @@ -6,7 +6,7 @@ import time from pycurl import HTTPHEADER from pyload.utils import json_loads -from pyload.plugin.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugin/hoster/ShareonlineBiz.py b/pyload/plugin/hoster/ShareonlineBiz.py index 5d671c77a..273431f99 100644 --- a/pyload/plugin/hoster/ShareonlineBiz.py +++ b/pyload/plugin/hoster/ShareonlineBiz.py @@ -7,7 +7,7 @@ from urllib import unquote from urlparse import urlparse from pyload.network.RequestFactory import getURL -from pyload.plugin.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugin/hoster/TurbobitNet.py b/pyload/plugin/hoster/TurbobitNet.py index af28f7d74..4c07cb84f 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.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster, timestamp diff --git a/pyload/plugin/hoster/UploadableCh.py b/pyload/plugin/hoster/UploadableCh.py index 9037b0250..c030c4178 100644 --- a/pyload/plugin/hoster/UploadableCh.py +++ b/pyload/plugin/hoster/UploadableCh.py @@ -2,7 +2,7 @@ import re -from pyload.plugin.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugin/hoster/UpstoreNet.py b/pyload/plugin/hoster/UpstoreNet.py index dcbf7ea9e..544cee633 100644 --- a/pyload/plugin/hoster/UpstoreNet.py +++ b/pyload/plugin/hoster/UpstoreNet.py @@ -2,7 +2,7 @@ import re -from pyload.plugin.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha from pyload.plugin.internal.SimpleHoster import SimpleHoster |