diff options
author | 2015-09-22 03:20:25 +0200 | |
---|---|---|
committer | 2015-09-22 03:20:25 +0200 | |
commit | fa5e570bfa4439812b4329f43d6a49e0b5239641 (patch) | |
tree | 6ac77a73b5d13186640de30d49ff9aa07808e2ea /module/plugins/internal/Plugin.py | |
parent | Merge pull request #1832 from GammaC0de/patch-1 (diff) | |
download | pyload-fa5e570bfa4439812b4329f43d6a49e0b5239641.tar.xz |
[Plugin] Fix _log + code cosmetics
Diffstat (limited to 'module/plugins/internal/Plugin.py')
-rw-r--r-- | module/plugins/internal/Plugin.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py index 47648e2fb..f6f7258fa 100644 --- a/module/plugins/internal/Plugin.py +++ b/module/plugins/internal/Plugin.py @@ -90,11 +90,11 @@ def which(program): return exe_file -def seconds_to_midnight(gmt=None): - if gmt is None: +def seconds_to_midnight(utc=None): + if utc is None: now = datetime.datetime.today() else: - now = datetime.datetime.utcnow() + datetime.timedelta(hours=gmt) + now = datetime.datetime.utcnow() + datetime.timedelta(hours=utc) midnight = now.replace(hour=0, minute=10, second=0, microsecond=0) + datetime.timedelta(days=1) @@ -212,7 +212,7 @@ class Plugin(object): def _log(self, level, plugintype, pluginname, messages): log = getattr(self.pyload.log, level) - msg = " | ".join(encode(a).strip() for a in messages if a) + msg = u" | ".join(decode(a).strip() for a in messages if a) log("%(plugintype)s %(pluginname)s: %(msg)s" % {'plugintype': plugintype.upper(), 'pluginname': pluginname, |