diff options
author | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-05-09 03:29:27 +0200 |
---|---|---|
committer | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-05-09 03:29:27 +0200 |
commit | d52ddee1d43b4be610b265fbe87911494d1364ad (patch) | |
tree | 3cc0b8db7fa1af4d08d4300c563062f31e64c80e | |
parent | [ShareonlineBiz] Fix https://github.com/pyload/pyload/issues/1403 (diff) | |
download | pyload-d52ddee1d43b4be610b265fbe87911494d1364ad.tar.xz |
[MultiHook] Remove unbound method 'getCrypters'
-rw-r--r-- | module/plugins/hooks/LinkdecrypterComHook.py | 4 | ||||
-rw-r--r-- | module/plugins/internal/MultiHook.py | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/module/plugins/hooks/LinkdecrypterComHook.py b/module/plugins/hooks/LinkdecrypterComHook.py index d0ec83c0b..b2eaece62 100644 --- a/module/plugins/hooks/LinkdecrypterComHook.py +++ b/module/plugins/hooks/LinkdecrypterComHook.py @@ -8,7 +8,7 @@ from module.plugins.internal.MultiHook import MultiHook class LinkdecrypterComHook(MultiHook): __name__ = "LinkdecrypterComHook" __type__ = "hook" - __version__ = "1.05" + __version__ = "1.06" __config__ = [("activated" , "bool" , "Activated" , True ), ("pluginmode" , "all;listed;unlisted", "Use for plugins" , "all"), @@ -21,7 +21,7 @@ class LinkdecrypterComHook(MultiHook): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - def getCrypters(self): + def getHosters(self): list = re.search(r'>Supported\(\d+\)</b>: <i>(.[\w.\-, ]+)', self.getURL("http://linkdecrypter.com/", decode=True).replace("(g)", "")).group(1).split(', ') try: diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py index 51c8ea89f..01ff4b07d 100644 --- a/module/plugins/internal/MultiHook.py +++ b/module/plugins/internal/MultiHook.py @@ -11,7 +11,7 @@ from module.utils import decode, remove_chars class MultiHook(Hook): __name__ = "MultiHook" __type__ = "hook" - __version__ = "0.44" + __version__ = "0.45" __config__ = [("pluginmode" , "all;listed;unlisted", "Use for plugins" , "all"), ("pluginlist" , "str" , "Plugin list (comma separated)", "" ), @@ -121,7 +121,7 @@ class MultiHook(Hook): for _i in xrange(2): try: - pluginset = self._pluginSet(self.getHosters() if self.plugintype == "hoster" else self.getCrypters()) + pluginset = self._pluginSet(self.getHosters()) break except Exception, e: @@ -171,14 +171,6 @@ class MultiHook(Hook): raise NotImplementedError - def getCrypters(self): - """Load list of supported crypters - - :return: List of domain names - """ - raise NotImplementedError - - #: Threaded _periodical, remove in 0.4.10 and use built-in flag for that def _periodical(self): try: |