From 6a3fd985302245ab2eda1de433d9ee335b3b6bed Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Sun, 28 Jul 2013 01:18:08 +0200 Subject: [PATCH] formatted_log_line(): drop useless append parameter --- picard/log.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/picard/log.py b/picard/log.py index 5eb66c528..6187158a3 100644 --- a/picard/log.py +++ b/picard/log.py @@ -100,22 +100,18 @@ _log_prefixes = { LOG_DEBUG: 'D', } -def formatted_log_line(level, time, message, append="", timefmt='hh:mm:ss', +def formatted_log_line(level, time, message, timefmt='hh:mm:ss', level_prefixes=_log_prefixes): + msg = "%s %s" % (time.toString(timefmt), message) if level_prefixes: - return "%s: %s %s%s" % (level_prefixes[level], - time.toString(timefmt), - message, - append) + return "%s: %s" % (level_prefixes[level], msg) else: - return "%s %s%s" % (time.toString(timefmt), - message, - append) + return msg def _stderr_receiver(level, time, msg): try: - sys.stderr.write(formatted_log_line(level, time, msg, os.linesep)) + sys.stderr.write(formatted_log_line(level, time, msg + os.linesep)) except UnicodeDecodeError: import traceback traceback.print_exc()