From ad4e9994d88165f19755e7481beca5773c7738c1 Mon Sep 17 00:00:00 2001 From: ny Date: Fri, 10 Jan 2025 17:24:58 +0100 Subject: [PATCH] fix(lint): Fix formatting --- SideBot/__init__.py | 3 +- SideBot/utils/__init__.py | 64 ++++++++++++++------------------------- 2 files changed, 23 insertions(+), 44 deletions(-) diff --git a/SideBot/__init__.py b/SideBot/__init__.py index 93a085a..f42f4d6 100644 --- a/SideBot/__init__.py +++ b/SideBot/__init__.py @@ -2,7 +2,6 @@ # pylint: disable=C0103,C0114 import logging -import pathlib import typing import yaml @@ -99,5 +98,5 @@ def run( @classmethod def from_yaml_file(cls, path: str = "conf.yaml") -> "SideBot": - with open(path, 'r') as f: + with open(path, "r") as f: return cls(yaml.safe_load(f)) diff --git a/SideBot/utils/__init__.py b/SideBot/utils/__init__.py index e5e08d6..a9f480f 100644 --- a/SideBot/utils/__init__.py +++ b/SideBot/utils/__init__.py @@ -5,16 +5,10 @@ class DBConfig: """DBConfig class for Postgresql with Bot""" - __slot__ = ('user', 'password', 'host', 'port', 'name') - - def __init__( - self, - user: str, - password: str, - host: str, - port: int | None = None, - name: str | None = None - ): + + __slot__ = ("user", "password", "host", "port", "name") + + def __init__(self, user: str, password: str, host: str, port: int | None = None, name: str | None = None): self.user = user self.password = password self.host = host @@ -28,34 +22,30 @@ def connect_str(self): @property def as_dict(self): return { - 'user': self.user, - 'pass': self.password, - 'host': self.host, - 'port': self.port, - 'name': self.name, + "user": self.user, + "pass": self.password, + "host": self.host, + "port": self.port, + "name": self.name, } @classmethod def from_dict(cls, data: dict): return cls( - data['user'], - data['pass'], - data['host'], - data['port'] if 'port' in data else None, - data['name'] if 'name' in data else data['user'] + data["user"], + data["pass"], + data["host"], + data["port"] if "port" in data else None, + data["name"] if "name" in data else data["user"], ) + class BotConfig: """BotConfig class for SideBot""" - __slots__ = ('token', 'owner', 'db_url', 'cogs') - - def __init__( - self, - token: str, - owner: int, - db_url: str, - cogs: list[str] - ): + + __slots__ = ("token", "owner", "db_url", "cogs") + + def __init__(self, token: str, owner: int, db_url: str, cogs: list[str]): self.token = token self.owner = owner self.db_url = db_url @@ -63,19 +53,9 @@ def __init__( @classmethod def from_dict(cls, data: dict): - if 'botDB' in data: - return cls( - data['discordToken'], - data['owner'], - DBConfig.from_dict(data['botDB']).connect_str, - data['cogs'] - ) - return cls( - data['discordToken'], - data['owner'], - data['botDBURL'], - data['cogs'] - ) + if "botDB" in data: + return cls(data["discordToken"], data["owner"], DBConfig.from_dict(data["botDB"]).connect_str, data["cogs"]) + return cls(data["discordToken"], data["owner"], data["botDBURL"], data["cogs"]) class DiscordUser: