From 4dc2da7708e23a44c665e07a92790f7e460995a3 Mon Sep 17 00:00:00 2001 From: JustAnotherArchivist Date: Mon, 12 Oct 2020 18:26:15 +0000 Subject: [PATCH] Clean up code structure inconsistencies --- irclog.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/irclog.py b/irclog.py index 85f4a06..d47110a 100644 --- a/irclog.py +++ b/irclog.py @@ -194,19 +194,17 @@ class Config(dict): raise InvalidConfig(f'Invalid channel {key!r} path: collides with channel {seenPaths[channel["path"]]!r}') seenPaths[channel['path']] = key - if 'auth' in channel: - if channel['auth'] is not False and not isinstance(channel['auth'], str): - raise InvalidConfig(f'Invalid channel {key!r} auth: must be false or a string') - if isinstance(channel['auth'], str) and ':' not in channel['auth']: - raise InvalidConfig(f'Invalid channel {key!r} auth: must contain a colon') - else: + if 'auth' not in channel: channel['auth'] = False + if channel['auth'] is not False and not isinstance(channel['auth'], str): + raise InvalidConfig(f'Invalid channel {key!r} auth: must be false or a string') + if isinstance(channel['auth'], str) and ':' not in channel['auth']: + raise InvalidConfig(f'Invalid channel {key!r} auth: must contain a colon') - if 'active' in channel: - if channel['active'] is not True and channel['active'] is not False: - raise InvalidConfig(f'Invalid channel {key!r} active: must be true or false') - else: + if 'active' not in channel: channel['active'] = True + if channel['active'] is not True and channel['active'] is not False: + raise InvalidConfig(f'Invalid channel {key!r} active: must be true or false') if 'hidden' not in channel: channel['hidden'] = False