diff options
Diffstat (limited to 'module')
-rw-r--r-- | module/plugins/hooks/BypassCaptcha.py | 2 | ||||
-rw-r--r-- | module/plugins/hooks/CaptchaBrotherhood.py | 2 | ||||
-rw-r--r-- | module/plugins/hooks/DeathByCaptcha.py | 2 | ||||
-rw-r--r-- | module/plugins/hooks/ImageTyperz.py | 2 | ||||
-rw-r--r-- | module/plugins/internal/Plugin.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/module/plugins/hooks/BypassCaptcha.py b/module/plugins/hooks/BypassCaptcha.py index a89d1c23f..4b155a67e 100644 --- a/module/plugins/hooks/BypassCaptcha.py +++ b/module/plugins/hooks/BypassCaptcha.py @@ -129,7 +129,7 @@ class BypassCaptcha(Hook): try: ticket, result = self.submit(c) except BypassCaptchaException, e: - task.error = e.getCode() + task.error = e.get_code() return task.data['ticket'] = ticket diff --git a/module/plugins/hooks/CaptchaBrotherhood.py b/module/plugins/hooks/CaptchaBrotherhood.py index 42a9a26d9..0df1ab8a9 100644 --- a/module/plugins/hooks/CaptchaBrotherhood.py +++ b/module/plugins/hooks/CaptchaBrotherhood.py @@ -161,7 +161,7 @@ class CaptchaBrotherhood(Hook): try: ticket, result = self.submit(c) except CaptchaBrotherhoodException, e: - task.error = e.getCode() + task.error = e.get_code() return task.data['ticket'] = ticket diff --git a/module/plugins/hooks/DeathByCaptcha.py b/module/plugins/hooks/DeathByCaptcha.py index c27db422b..98572191e 100644 --- a/module/plugins/hooks/DeathByCaptcha.py +++ b/module/plugins/hooks/DeathByCaptcha.py @@ -209,7 +209,7 @@ class DeathByCaptcha(Hook): try: ticket, result = self.submit(c) except DeathByCaptchaException, e: - task.error = e.getCode() + task.error = e.get_code() self.log_error(e.getDesc()) return diff --git a/module/plugins/hooks/ImageTyperz.py b/module/plugins/hooks/ImageTyperz.py index d453122d0..42ab99027 100644 --- a/module/plugins/hooks/ImageTyperz.py +++ b/module/plugins/hooks/ImageTyperz.py @@ -148,7 +148,7 @@ class ImageTyperz(Hook): try: ticket, result = self.submit(c) except ImageTyperzException, e: - task.error = e.getCode() + task.error = e.get_code() return task.data['ticket'] = ticket diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py index 59528a441..76056c66d 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 "", |