3
0

format with black (mostly quotes)

This commit is contained in:
2023-11-15 10:02:28 +01:00
parent ced589f28a
commit 0f45f89211
22 changed files with 245 additions and 272 deletions
+11 -11
View File
@@ -39,7 +39,7 @@ class Config:
@staticmethod
def load(filename: str | None = None) -> Config:
if filename is None:
for name in ('capport.yaml', '/etc/capport.yaml'):
for name in ("capport.yaml", "/etc/capport.yaml"):
if os.path.exists(name):
return Config.load(name)
raise RuntimeError("Missing config file")
@@ -47,19 +47,19 @@ class Config:
data = yaml.safe_load(f)
if not isinstance(data, dict):
raise RuntimeError(f"Invalid yaml config data, expected dict: {data!r}")
controllers = list(map(str, data.pop('controllers')))
controllers = list(map(str, data.pop("controllers")))
config = Config(
_source_filename=filename,
controllers=controllers,
server_names=data.pop('server-names', []),
comm_secret=str(data.pop('comm-secret')),
cookie_secret=str(data.pop('cookie-secret')),
venue_info_url=str(data.pop('venue-info-url')),
session_timeout=data.pop('session-timeout', 3600),
api_port=data.pop('api-port', 8000),
controller_port=data.pop('controller-port', 5000),
database_file=str(data.pop('database-file', 'capport.state')),
debug=data.pop('debug', False)
server_names=data.pop("server-names", []),
comm_secret=str(data.pop("comm-secret")),
cookie_secret=str(data.pop("cookie-secret")),
venue_info_url=str(data.pop("venue-info-url")),
session_timeout=data.pop("session-timeout", 3600),
api_port=data.pop("api-port", 8000),
controller_port=data.pop("controller-port", 5000),
database_file=str(data.pop("database-file", "capport.state")),
debug=data.pop("debug", False),
)
if data:
_logger.error(f"Unknown config elements: {list(data.keys())}")