Skip to content

Commit c497805

Browse files
committed
Fix various static analysis issues
1 parent 1a0cc26 commit c497805

File tree

13 files changed

+282
-135
lines changed

13 files changed

+282
-135
lines changed

ircurltitlebot/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
"""Package initialization."""
12
from .bot import Bot

ircurltitlebot/__main__.py

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
"""Package entrypoint."""
12
import argparse
2-
import logging
33
import json
4+
import logging
45
from pathlib import Path
56

67
from ruamel.yaml import YAML
@@ -11,48 +12,52 @@
1112

1213

1314
def main() -> None:
15+
"""Start the bot."""
1416
# Read args
1517
parser = argparse.ArgumentParser(prog=config.PACKAGE_NAME, description="IRC URL title posting bot")
16-
parser.add_argument('--config-path', required=True, help='Configuration file path, e.g. /some/dir/config.yaml')
18+
parser.add_argument("--config-path", required=True, help="Configuration file path, e.g. /some/dir/config.yaml")
1719
instance_config_path = Path(parser.parse_args().config_path)
1820

1921
# Read user config
20-
log.debug('Reading instance configuration file %s', instance_config_path)
22+
log.debug("Reading instance configuration file %s", instance_config_path)
2123
instance_config = YAML().load(instance_config_path)
2224
instance_config = json.loads(json.dumps(instance_config)) # Recursively use a dict as the data structure.
2325

2426
# Log user config
2527
logged_instance_config = instance_config.copy()
26-
if 'sites' in logged_instance_config:
27-
del logged_instance_config['sites']
28-
log.info('Read user configuration file %s having excerpted configuration: %s',
29-
instance_config_path, logged_instance_config)
30-
for site, site_config in instance_config.get('sites', {}).items():
31-
log.info('User configuration for site %s is: %s', site, site_config)
28+
if "sites" in logged_instance_config:
29+
del logged_instance_config["sites"]
30+
log.info(
31+
"Read user configuration file %s having excerpted configuration: %s",
32+
instance_config_path,
33+
logged_instance_config,
34+
)
35+
for site, site_config in instance_config.get("sites", {}).items():
36+
log.info("User configuration for site %s is: %s", site, site_config)
3237

3338
# Set alerts channel
34-
if 'alerts_channel' not in instance_config:
35-
instance_config['alerts_channel'] = config.ALERTS_CHANNEL_FORMAT_DEFAULT
36-
instance_config['alerts_channel'] = instance_config['alerts_channel'].format(nick=instance_config['nick'])
37-
if instance_config['alerts_channel'] not in instance_config['channels']:
38-
instance_config['channels'].append(instance_config['alerts_channel'])
39+
if "alerts_channel" not in instance_config:
40+
instance_config["alerts_channel"] = config.ALERTS_CHANNEL_FORMAT_DEFAULT
41+
instance_config["alerts_channel"] = instance_config["alerts_channel"].format(nick=instance_config["nick"])
42+
if instance_config["alerts_channel"] not in instance_config["channels"]:
43+
instance_config["channels"].append(instance_config["alerts_channel"])
3944

4045
# Process user config
41-
instance_config['nick:casefold'] = instance_config['nick'].casefold()
42-
instance_config['channels:casefold'] = [channel.casefold() for channel in instance_config['channels']]
43-
instance_config['ignores:casefold'] = [ignore.casefold() for ignore in instance_config.get('ignores', [])]
46+
instance_config["nick:casefold"] = instance_config["nick"].casefold()
47+
instance_config["channels:casefold"] = [channel.casefold() for channel in instance_config["channels"]]
48+
instance_config["ignores:casefold"] = [ignore.casefold() for ignore in instance_config.get("ignores", [])]
4449

4550
# Process blacklist
46-
blacklists = instance_config['blacklist'] = instance_config.get('blacklist', {})
47-
blacklists['title'] = set(blacklists.get('title', set()))
48-
blacklists['title'] = {entry.casefold() for entry in blacklists['title']}
49-
blacklists['url'] = set(blacklists.get('url', set()))
51+
blacklists = instance_config["blacklist"] = instance_config.get("blacklist", {})
52+
blacklists["title"] = set(blacklists.get("title", set()))
53+
blacklists["title"] = {entry.casefold() for entry in blacklists["title"]}
54+
blacklists["url"] = set(blacklists.get("url", set()))
5055

5156
config.INSTANCE = instance_config
5257

5358
# Start bot
5459
Bot()
5560

5661

57-
if __name__ == '__main__':
62+
if __name__ == "__main__":
5863
main()

0 commit comments

Comments
 (0)