GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-01-24 19:24:13 +01:00
Code Issues Projects Releases Wiki Activity

conf: actually pass the logger object to _log in validateConf

Browse Source
This commit is contained in:
James Lu 2017-06-02 08:34:15 -07:00
parent 1996b86e85
commit 9ea9f66dd7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf.py
View File

@ -68,7 +68,7 @@ def validateConf(conf, logger=None):
if 'pylink' in conf and 'bot' in conf: if 'pylink' in conf and 'bot' in conf:
_log(logging.WARNING, "Since PyLink 1.2, the 'pylink:' and 'bot:' configuration sections have been condensed " _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 = conf['bot'].copy()
new_block.update(conf['pylink']) 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 # Also we'll warn them that login:user/login:password is deprecated
if conf['login'].get('password') or conf['login'].get('user'): 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. " _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 old_login_valid = type(conf['login'].get('password')) == type(conf['login'].get('user')) == str
newlogins = conf['login'].get('accounts', {}) newlogins = conf['login'].get('accounts', {})