diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-14 02:58:43 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-14 02:58:43 +0200 |
| commit | bfe66d14090586ff79a1ccac0e37a5dad99c5601 (patch) | |
| tree | f89a3b6038344aad70a8abdd178af6af89c9a5a3 /pyload/plugin/internal | |
| parent | Cleanup (2) (diff) | |
| parent | fix: assignJob (diff) | |
| download | pyload-bfe66d14090586ff79a1ccac0e37a5dad99c5601.tar.xz | |
Merge pull request #4 from ardi69/0.4.10
fix: assignJob and typos (__name vs. __name__)
Diffstat (limited to 'pyload/plugin/internal')
| -rw-r--r-- | pyload/plugin/internal/SimpleHoster.py | 18 | ||||
| -rw-r--r-- | pyload/plugin/internal/XFSHoster.py | 1 |
2 files changed, 10 insertions, 9 deletions
diff --git a/pyload/plugin/internal/SimpleHoster.py b/pyload/plugin/internal/SimpleHoster.py index 9fe5b1260..09f49af18 100644 --- a/pyload/plugin/internal/SimpleHoster.py +++ b/pyload/plugin/internal/SimpleHoster.py @@ -307,11 +307,11 @@ class SimpleHoster(Hoster): LOGIN_ACCOUNT = False #: Set to True to require account login DISPOSITION = True #: Set to True to use any content-disposition value in http header as file name - directLink = getFileURL #@TODO: Remove in 0.4.10 + directLink = getFileURL # @TODO: Remove in 0.4.10 @classmethod - def parseInfos(cls, urls): #@TODO: Built-in in 0.4.10 core (remove from plugins) + def parseInfos(cls, urls): # @TODO: Built-in in 0.4.10 core (remove from plugins) for url in urls: url = replace_patterns(url, cls.URL_REPLACEMENTS) yield cls.getInfo(url) @@ -414,13 +414,13 @@ class SimpleHoster(Hoster): def prepare(self): - self.pyfile.error = "" #@TODO: Remove in 0.4.10 + self.pyfile.error = "" # @TODO: Remove in 0.4.10 self.info = {} self.html = "" - self.link = "" #@TODO: Move to hoster class in 0.4.10 - self.directDL = False #@TODO: Move to hoster class in 0.4.10 - self.multihost = False #@TODO: Move to hoster class in 0.4.10 + self.link = "" # @TODO: Move to hoster class in 0.4.10 + self.directDL = False # @TODO: Move to hoster class in 0.4.10 + self.multihost = False # @TODO: Move to hoster class in 0.4.10 if not self.getConfig('use_premium', True): self.retryFree() @@ -486,7 +486,7 @@ class SimpleHoster(Hoster): self.downloadLink(self.link, self.DISPOSITION) self.checkFile() - except Fail, e: #@TODO: Move to PluginThread in 0.4.10 + except Fail, e: # @TODO: Move to PluginThread in 0.4.10 if self.premium: self.logWarning(_("Premium download failed")) self.retryFree() @@ -733,7 +733,7 @@ class SimpleHoster(Hoster): return size <= traffic - def getConfig(self, option, default=''): #@TODO: Remove in 0.4.10 + def getConfig(self, option, default=''): # @TODO: Remove in 0.4.10 """getConfig with default value - sublass may not implements all config options""" try: return self.getConf(option) @@ -747,7 +747,7 @@ class SimpleHoster(Hoster): return self.premium = False self.account = None - self.req = self.core.requestFactory.getRequest(self.__name) + self.req = self.core.requestFactory.getRequest(self.__class__.__name__) self.retries = 0 raise Retry(_("Fallback to free download")) diff --git a/pyload/plugin/internal/XFSHoster.py b/pyload/plugin/internal/XFSHoster.py index 4cef261df..92ec020a6 100644 --- a/pyload/plugin/internal/XFSHoster.py +++ b/pyload/plugin/internal/XFSHoster.py @@ -25,6 +25,7 @@ class XFSHoster(SimpleHoster): ("stickell" , "l.stickell@yahoo.it"), ("Walter Purcaro", "vuolter@gmail.com")] + HOSTER_DOMAIN = None TEXT_ENCODING = False |