def load_config():
with open('relay.yaml') as f:
- yaml_file = yaml.load(f)
- whitelist = yaml_file['ap'].get('whitelist', [])
- blocked = yaml_file['ap'].get('blocked_instances', [])
+ options = {}
+
+ ## Prevent a warning message for pyyaml 5.1+
+ if getattr(yaml, 'FullLoader', None):
+ options['Loader'] = yaml.FullLoader
+
+ yaml_file = yaml.load(f, **options)
config = {
'db': yaml_file.get('db', 'relay.jsonld'),
'port': int(yaml_file.get('port', 8080)),
'note': yaml_file.get('note', 'Make a note about your instance here.'),
'ap': {
- 'blocked_instances': [] if blocked is None else blocked,
+ 'blocked_instances': yaml_file['ap'].get('blocked_instances', []),
'host': yaml_file['ap'].get('host', 'localhost'),
- 'whitelist': [] if whitelist is None else whitelist,
+ 'whitelist': yaml_file['ap'].get('whitelist', []),
'whitelist_enabled': yaml_file['ap'].get('whitelist_enabled', False)
}
}