From 2b4932c6626be2a3d08757719306e90bf264c0b2 Mon Sep 17 00:00:00 2001 From: Christopher Rosell Date: Sat, 8 Sep 2012 01:40:12 +0200 Subject: Make logger handle both args and keyword args. --- src/livestreamer/logger.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/livestreamer/logger.py b/src/livestreamer/logger.py index 53519d3..f11bdc2 100644 --- a/src/livestreamer/logger.py +++ b/src/livestreamer/logger.py @@ -22,11 +22,11 @@ class Logger(object): def set_output(self, output): self.output = output - def msg(self, module, level, msg, *args): + def msg(self, module, level, msg, *args, **kw): if self.level < level or level > len(Logger.Levels): return - msg = msg.format(*args) + msg = msg.format(*args, **kw) self.output.write(Logger.Format.format(module=module, level=Logger.Levels[level], @@ -38,16 +38,16 @@ class LoggerModule(object): self.manager = manager self.module = module - def error(self, msg, *args): - self.manager.msg(self.module, 1, msg, *args) + def error(self, msg, *args, **kw): + self.manager.msg(self.module, 1, msg, *args, **kw) - def warning(self, msg, *args): - self.manager.msg(self.module, 2, msg, *args) + def warning(self, msg, *args, **kw): + self.manager.msg(self.module, 2, msg, *args, **kw) - def info(self, msg, *args): - self.manager.msg(self.module, 3, msg, *args) + def info(self, msg, *args, **kw): + self.manager.msg(self.module, 3, msg, *args, **kw) - def debug(self, msg, *args): - self.manager.msg(self.module, 4, msg, *args) + def debug(self, msg, *args, **kw): + self.manager.msg(self.module, 4, msg, *args, **kw) __all__ = ["Logger"] -- cgit v1.2.3