summaryrefslogtreecommitdiffstats
path: root/module/plugins/internal/Base.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-12-28 23:46:24 +0100
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-12-28 23:46:24 +0100
commit58878a455067837dbe72c690606157831d3afae1 (patch)
treeac59fe8fa23a2531f7fdf03341ed1eff0326f67f /module/plugins/internal/Base.py
parentSpare code fixes (2) (diff)
downloadpyload-58878a455067837dbe72c690606157831d3afae1.tar.xz
Spare code fixes (3)
Diffstat (limited to 'module/plugins/internal/Base.py')
-rw-r--r--module/plugins/internal/Base.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/module/plugins/internal/Base.py b/module/plugins/internal/Base.py
index 3d0bed791..47111ca8e 100644
--- a/module/plugins/internal/Base.py
+++ b/module/plugins/internal/Base.py
@@ -105,6 +105,7 @@ class Base(Plugin):
log = getattr(self.pyload.log, level)
msg = u" | ".join(decode(a).strip() for a in messages if a)
+ #: Hide any password
try:
msg = msg.replace(self.account.info['login']['password'], "**********")
except Exception:
@@ -253,7 +254,7 @@ class Base(Plugin):
self.log_debug("Plugin status: " + self.__status__)
if self.__status__ is "broken":
- self.fail(_("Plugin is temporarily unavailable"))
+ self.abort(_("Plugin is temporarily unavailable"))
elif self.__status__ is "testing":
self.log_warning(_("Plugin may be unstable"))
@@ -268,7 +269,8 @@ class Base(Plugin):
self._initialize()
self._setup()
- # self.pyload.hookManager.downloadPreparing(self.pyfile) #@TODO: Recheck in 0.4.10
+ #@TODO: Enable in 0.4.10
+ # self.pyload.hookManager.downloadPreparing(self.pyfile)
# self.check_status()
self.pyfile.setStatus("starting")