diff options
| author | 2015-03-09 18:20:24 +0100 | |
|---|---|---|
| committer | 2015-03-09 18:20:24 +0100 | |
| commit | 2d302677064dd5996add552ee214093c6d73acea (patch) | |
| tree | 9a0b00c5e23fd8e3ce3ab729cade735b579ee4fd /module | |
| parent | [UnRar] Fix https://github.com/pyload/pyload/issues/1234 (diff) | |
| download | pyload-2d302677064dd5996add552ee214093c6d73acea.tar.xz | |
Rename fileUrl to getFileURL
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/hoster/BasePlugin.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleDereferer.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 8 | 
3 files changed, 10 insertions, 10 deletions
| diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py index f9eb695ca..42bfed91e 100644 --- a/module/plugins/hoster/BasePlugin.py +++ b/module/plugins/hoster/BasePlugin.py @@ -6,14 +6,14 @@ from urllib import unquote  from urlparse import urljoin, urlparse  from module.network.HTTPRequest import BadHeader -from module.plugins.internal.SimpleHoster import create_getInfo, fileUrl +from module.plugins.internal.SimpleHoster import create_getInfo, getFileURL  from module.plugins.Hoster import Hoster  class BasePlugin(Hoster):      __name__    = "BasePlugin"      __type__    = "hoster" -    __version__ = "0.34" +    __version__ = "0.35"      __pattern__ = r'^unmatchable$' @@ -51,7 +51,7 @@ class BasePlugin(Hoster):          for _i in xrange(5):              try: -                link = fileUrl(self, unquote(pyfile.url)) +                link = getFileURL(self, unquote(pyfile.url))                  if link:                      self.download(link, ref=False, disposition=True) diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py index bd00f5d25..577d56f75 100644 --- a/module/plugins/internal/SimpleDereferer.py +++ b/module/plugins/internal/SimpleDereferer.py @@ -5,13 +5,13 @@ import re  from urllib import unquote  from module.plugins.Crypter import Crypter -from module.plugins.internal.SimpleHoster import fileUrl, set_cookies +from module.plugins.internal.SimpleHoster import getFileURL, set_cookies  class SimpleDereferer(Crypter):      __name__    = "SimpleDereferer"      __type__    = "crypter" -    __version__ = "0.07" +    __version__ = "0.08"      __pattern__ = r'^unmatchable$'      __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), @@ -45,7 +45,7 @@ class SimpleDereferer(Crypter):      def decrypt(self, pyfile): -        link = fileUrl(self, pyfile.url) +        link = getFileURL(self, pyfile.url)          if not link:              try: diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index e4ff1a2d8..0adfc64b3 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -141,7 +141,7 @@ def timestamp():  #@TODO: Move to hoster class in 0.4.10 -def fileUrl(self, url, follow_location=None): +def getFileURL(self, url, follow_location=None):      link     = ""      redirect = 1 @@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):  class SimpleHoster(Hoster):      __name__    = "SimpleHoster"      __type__    = "hoster" -    __version__ = "1.15" +    __version__ = "1.16"      __pattern__ = r'^unmatchable$' @@ -311,7 +311,7 @@ class SimpleHoster(Hoster):      LOGIN_ACCOUNT = False  #: Set to True to require account login      DISPOSITION   = True   #: Work-around to `filename*=UTF-8` bug; remove in 0.4.10 -    directLink = fileUrl  #@TODO: Remove in 0.4.10 +    directLink = getFileURL  #@TODO: Remove in 0.4.10      @classmethod @@ -349,7 +349,7 @@ class SimpleHoster(Hoster):                  info['error']  = "missing url"                  info['status'] = 1 -            elif info['status'] is 3 and not fileUrl(None, url): +            elif info['status'] is 3 and not getFileURL(None, url):                  try:                      html = getURL(url, cookies=cls.COOKIES, decode=not cls.TEXT_ENCODING) | 
