diff options
Diffstat (limited to 'pyload/plugin/hoster')
| -rw-r--r-- | pyload/plugin/hoster/FileserveCom.py | 10 | ||||
| -rw-r--r-- | pyload/plugin/hoster/NoPremiumPl.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/hoster/RapideoPl.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/hoster/XFileSharingPro.py | 4 | ||||
| -rw-r--r-- | pyload/plugin/hoster/Xdcc.py | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/pyload/plugin/hoster/FileserveCom.py b/pyload/plugin/hoster/FileserveCom.py index b275f6e86..a7bb22440 100644 --- a/pyload/plugin/hoster/FileserveCom.py +++ b/pyload/plugin/hoster/FileserveCom.py @@ -40,9 +40,9 @@ class FileserveCom(Hoster): __description = """Fileserve.com hoster plugin""" __license = "GPLv3" __authors = [("jeix", "jeix@hasnomail.de"), - ("mkaay", "mkaay@mkaay.de"), - ("Paul King", ""), - ("zoidberg", "zoidberg@mujmail.cz")] + ("mkaay", "mkaay@mkaay.de"), + ("Paul King", ""), + ("zoidberg", "zoidberg@mujmail.cz")] URLS = ["http://www.fileserve.com/file/", "http://www.fileserve.com/link-checker.php", @@ -144,7 +144,7 @@ class FileserveCom(Hoster): if "fail" in res: self.fail(_("Failed getting wait time")) - if self.__name == "FilejungleCom": + if self.__class__.__name__ == "FilejungleCom": m = re.search(r'"waitTime":(\d+)', res) if m is None: self.fail(_("Cannot get wait time")) @@ -184,7 +184,7 @@ class FileserveCom(Hoster): def handlePremium(self, pyfile): premium_url = None - if self.__name == "FileserveCom": + if self.__class__.__name__ == "FileserveCom": #try api download res = self.load("http://app.fileserve.com/api/download/premium/", post={"username": self.user, diff --git a/pyload/plugin/hoster/NoPremiumPl.py b/pyload/plugin/hoster/NoPremiumPl.py index 701ca6a6d..109932721 100644 --- a/pyload/plugin/hoster/NoPremiumPl.py +++ b/pyload/plugin/hoster/NoPremiumPl.py @@ -79,7 +79,7 @@ class NoPremiumPl(MultiHoster): if "errno" in parsed.keys(): if parsed["errno"] in self.ERROR_CODES: # error code in known - self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name) + self.fail(self.ERROR_CODES[parsed["errno"]] % self.__class__.__name__) else: # error code isn't yet added to plugin self.fail( diff --git a/pyload/plugin/hoster/RapideoPl.py b/pyload/plugin/hoster/RapideoPl.py index 88a596dc7..70e3fd853 100644 --- a/pyload/plugin/hoster/RapideoPl.py +++ b/pyload/plugin/hoster/RapideoPl.py @@ -79,7 +79,7 @@ class RapideoPl(MultiHoster): if "errno" in parsed.keys(): if parsed["errno"] in self.ERROR_CODES: # error code in known - self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name) + self.fail(self.ERROR_CODES[parsed["errno"]] % self.__class__.__name__) else: # error code isn't yet added to plugin self.fail( diff --git a/pyload/plugin/hoster/XFileSharingPro.py b/pyload/plugin/hoster/XFileSharingPro.py index 0696674df..8274a818a 100644 --- a/pyload/plugin/hoster/XFileSharingPro.py +++ b/pyload/plugin/hoster/XFileSharingPro.py @@ -23,13 +23,13 @@ class XFileSharingPro(XFSHoster): def _log(self, type, args): msg = " | ".join(str(a).strip() for a in args if a) logger = getattr(self.log, type) - logger("%s: %s: %s" % (self.__name, self.HOSTER_NAME, msg or _("%s MARK" % type.upper()))) + logger("%s: %s: %s" % (self.__class__.__name__, self.HOSTER_NAME, msg or _("%s MARK" % type.upper()))) def init(self): super(XFileSharingPro, self).init() - self.__pattern = self.core.pluginManager.hosterPlugins[self.__name]['pattern'] + self.__pattern = self.core.pluginManager.hosterPlugins[self.__class__.__name__]['pattern'] self.HOSTER_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower() self.HOSTER_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.HOSTER_DOMAIN) if part != '.') diff --git a/pyload/plugin/hoster/Xdcc.py b/pyload/plugin/hoster/Xdcc.py index eda518150..f2b5d0b8f 100644 --- a/pyload/plugin/hoster/Xdcc.py +++ b/pyload/plugin/hoster/Xdcc.py @@ -36,7 +36,7 @@ class Xdcc(Hoster): def process(self, pyfile): # change request type - self.req = pyfile.m.core.requestFactory.getRequest(self.__name, type="XDCC") + self.req = pyfile.m.core.requestFactory.getRequest(self.__class__.__name__, type="XDCC") self.pyfile = pyfile for _i in xrange(0, 3): |