diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-20 23:07:42 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-20 23:07:42 +0200 |
| commit | 2475ddb7654d0d6fb1be18082b5c8c480befdbb3 (patch) | |
| tree | b82a8b5fc0a309f69733b0a004284f4ef45833d8 /pyload/plugin/internal | |
| parent | Spare code cosmetics (9) (diff) | |
| parent | added check of classname == filename (diff) | |
| download | pyload-2475ddb7654d0d6fb1be18082b5c8c480befdbb3.tar.xz | |
Merge branch 'pr/n10_ardi69' into 0.4.10
Conflicts:
pyload/plugin/hoster/FileserveCom.py
Diffstat (limited to 'pyload/plugin/internal')
| -rw-r--r-- | pyload/plugin/internal/MultiHook.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/internal/MultiHoster.py | 4 | ||||
| -rw-r--r-- | pyload/plugin/internal/SimpleHoster.py | 4 | ||||
| -rw-r--r-- | pyload/plugin/internal/XFSCrypter.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/internal/XFSHoster.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/pyload/plugin/internal/MultiHook.py b/pyload/plugin/internal/MultiHook.py index 8140e2431..dc97ffea9 100644 --- a/pyload/plugin/internal/MultiHook.py +++ b/pyload/plugin/internal/MultiHook.py @@ -69,7 +69,7 @@ class MultiHook(Hook): def initPlugin(self): - self.pluginname = self.__class__.__name__ + self.pluginname = self.getClassName() plugin, self.plugintype = self.core.pluginManager.findPlugin(("hoster", "crypter", "container"), self.pluginname) if plugin: diff --git a/pyload/plugin/internal/MultiHoster.py b/pyload/plugin/internal/MultiHoster.py index a7e74b2ff..8dbcf4f30 100644 --- a/pyload/plugin/internal/MultiHoster.py +++ b/pyload/plugin/internal/MultiHoster.py @@ -86,8 +86,8 @@ class MultiHoster(SimpleHoster): self.retryFree() elif self.getConfig('revertfailed', True) \ - and "new_module" in self.core.pluginManager.hosterPlugins[self.__class__.__name__]: - hdict = self.core.pluginManager.hosterPlugins[self.__class__.__name__] + and "new_module" in self.core.pluginManager.hosterPlugins[self.getClassName()]: + hdict = self.core.pluginManager.hosterPlugins[self.getClassName()] tmp_module = hdict['new_module'] tmp_name = hdict['new_name'] diff --git a/pyload/plugin/internal/SimpleHoster.py b/pyload/plugin/internal/SimpleHoster.py index 02231decc..75970d814 100644 --- a/pyload/plugin/internal/SimpleHoster.py +++ b/pyload/plugin/internal/SimpleHoster.py @@ -434,7 +434,7 @@ class SimpleHoster(Hoster): set_cookies(self.req.cj, self.COOKIES) if (self.MULTI_HOSTER - and (self.__pattern != self.core.pluginManager.hosterPlugins[self.__class__.__name__]['pattern'] + and (self.__pattern != self.core.pluginManager.hosterPlugins[self.getClassName()]['pattern'] or re.match(self.__pattern, self.pyfile.url) is None)): self.multihost = True return @@ -746,7 +746,7 @@ class SimpleHoster(Hoster): return self.premium = False self.account = None - self.req = self.core.requestFactory.getRequest(self.__class__.__name__) + self.req = self.core.requestFactory.getRequest(self.getClassName()) self.retries = 0 raise Retry(_("Fallback to free download")) diff --git a/pyload/plugin/internal/XFSCrypter.py b/pyload/plugin/internal/XFSCrypter.py index 6a3f09e55..6c3a97405 100644 --- a/pyload/plugin/internal/XFSCrypter.py +++ b/pyload/plugin/internal/XFSCrypter.py @@ -31,7 +31,7 @@ class XFSCrypter(SimpleCrypter): if self.account: account = self.account else: - account_name = (self.__class__.__name__ + ".py").replace("Folder.py", "").replace(".py", "") + account_name = (self.getClassName() + ".py").replace("Folder.py", "").replace(".py", "") account = self.pyfile.m.core.accountManager.getAccountPlugin(account_name) if account and hasattr(account, "HOSTER_DOMAIN") and account.HOSTER_DOMAIN: diff --git a/pyload/plugin/internal/XFSHoster.py b/pyload/plugin/internal/XFSHoster.py index 7b8149bc3..ff8077f81 100644 --- a/pyload/plugin/internal/XFSHoster.py +++ b/pyload/plugin/internal/XFSHoster.py @@ -65,7 +65,7 @@ class XFSHoster(SimpleHoster): if self.account: account = self.account else: - account = self.pyfile.m.core.accountManager.getAccountPlugin(self.__class__.__name__) + account = self.pyfile.m.core.accountManager.getAccountPlugin(self.getClassName()) if account and hasattr(account, "HOSTER_DOMAIN") and account.HOSTER_DOMAIN: self.HOSTER_DOMAIN = account.HOSTER_DOMAIN |