From 9ea9f66dd7bd8ed88ce09f6161b0d300d5c2ab61 Mon Sep 17 00:00:00 2001 From: James Lu Date: Fri, 2 Jun 2017 08:34:15 -0700 Subject: [PATCH] conf: actually pass the logger object to _log in validateConf --- conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.py b/conf.py index 487c443..b6e6dac 100644 --- a/conf.py +++ b/conf.py @@ -68,7 +68,7 @@ def validateConf(conf, logger=None): if 'pylink' in conf and 'bot' in conf: _log(logging.WARNING, "Since PyLink 1.2, the 'pylink:' and 'bot:' configuration sections have been condensed " - "into one. You should merge any options under these sections into one 'pylink:' block.") + "into one. You should merge any options under these sections into one 'pylink:' block.", logger=logger) new_block = conf['bot'].copy() new_block.update(conf['pylink']) @@ -86,7 +86,7 @@ def validateConf(conf, logger=None): # Also we'll warn them that login:user/login:password is deprecated if conf['login'].get('password') or conf['login'].get('user'): _log(logging.WARNING, "The 'login:user' and 'login:password' options are deprecated since PyLink 1.1. " - "Please switch to the new 'login:accounts' format as outlined in the example config.") + "Please switch to the new 'login:accounts' format as outlined in the example config.", logger=logger) old_login_valid = type(conf['login'].get('password')) == type(conf['login'].get('user')) == str newlogins = conf['login'].get('accounts', {})