diff options
| -rw-r--r-- | module/plugins/internal/Captcha.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/Extractor.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/MultiCrypter.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/MultiHoster.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/OCR.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/Plugin.py | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/module/plugins/internal/Captcha.py b/module/plugins/internal/Captcha.py index 92bcf9f84..f126ca85e 100644 --- a/module/plugins/internal/Captcha.py +++ b/module/plugins/internal/Captcha.py @@ -12,7 +12,7 @@ from module.plugins.internal.Plugin import Plugin class Captcha(Plugin): __name__ = "Captcha" __type__ = "captcha" - __version__ = "0.37" + __version__ = "0.38" __status__ = "testing" __description__ = """Base anti-captcha plugin""" @@ -39,8 +39,8 @@ class Captcha(Plugin): def _log(self, level, plugintype, pluginname, messages): return self.plugin._log(level, plugintype, - "%s: %s" % (self.plugin.__name__, self.__name__), - messages) + self.plugin.__name__, + (self.__name__,) + messages) def recognize(self, image): diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py index d511b7602..c16b1a846 100644 --- a/module/plugins/internal/Extractor.py +++ b/module/plugins/internal/Extractor.py @@ -22,7 +22,7 @@ class PasswordError(Exception): class Extractor(Plugin): __name__ = "Extractor" __type__ = "extractor" - __version__ = "0.30" + __version__ = "0.31" __status__ = "testing" __description__ = """Base extractor plugin""" @@ -116,8 +116,8 @@ class Extractor(Plugin): def _log(self, level, plugintype, pluginname, messages): return self.plugin._log(level, plugintype, - "%s: %s" % (self.plugin.__name__, self.__name__), - messages) + self.plugin.__name__, + (self.__name__,) + messages) def check(self): diff --git a/module/plugins/internal/MultiCrypter.py b/module/plugins/internal/MultiCrypter.py index 5771e7e96..ca7b03941 100644 --- a/module/plugins/internal/MultiCrypter.py +++ b/module/plugins/internal/MultiCrypter.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter class MultiCrypter(SimpleCrypter): __name__ = "MultiCrypter" __type__ = "hoster" - __version__ = "0.01" + __version__ = "0.02" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -25,5 +25,5 @@ class MultiCrypter(SimpleCrypter): def _log(self, level, plugintype, pluginname, messages): return super(MultiCrypter, self)._log(level, plugintype, - "%s: %s" % (pluginname, self.CRYPTER_NAME), - messages) + pluginname, + (self.CRYPTER_NAME,) + messages) diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index 5dcdfa46b..cdb668b82 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r class MultiHoster(SimpleHoster): __name__ = "MultiHoster" __type__ = "hoster" - __version__ = "0.48" + __version__ = "0.49" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -34,8 +34,8 @@ class MultiHoster(SimpleHoster): def _log(self, level, plugintype, pluginname, messages): return super(MultiHoster, self)._log(level, plugintype, - "%s: %s" % (pluginname, self.HOSTER_NAME), - messages) + pluginname, + (self.HOSTER_NAME,) + messages) def setup(self): diff --git a/module/plugins/internal/OCR.py b/module/plugins/internal/OCR.py index 8eb240051..805755f39 100644 --- a/module/plugins/internal/OCR.py +++ b/module/plugins/internal/OCR.py @@ -21,7 +21,7 @@ from module.utils import save_join as fs_join class OCR(Plugin): __name__ = "OCR" __type__ = "ocr" - __version__ = "0.16" + __version__ = "0.17" __status__ = "testing" __description__ = """OCR base plugin""" @@ -47,8 +47,8 @@ class OCR(Plugin): def _log(self, level, plugintype, pluginname, messages): return self.plugin._log(level, plugintype, - "%s: %s" % (self.plugin.__name__, self.__name__), - messages) + self.plugin.__name__, + (self.__name__,) + messages) def load_image(self, image): diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py index 76056c66d..59528a441 100644 --- a/module/plugins/internal/Plugin.py +++ b/module/plugins/internal/Plugin.py @@ -168,7 +168,7 @@ class Plugin(object): def _log(self, level, plugintype, pluginname, messages): log = getattr(self.pyload.log, level) msg = encode(" | ".join((a if isinstance(a, basestring) else str(a)).strip() for a in messages if a)) - log("%(plugintype)s %(pluginname)s%(id)s: %(msg)s" + log("%(plugintype)s %(pluginname)s%(id)s : %(msg)s" % {'plugintype': plugintype.upper(), 'pluginname': pluginname, 'id' : ("[%s]" % self.pyfile.id) if hasattr(self, 'pyfile') else "", |