Skip to content

Commit ad4e999

Browse files
committed
fix(lint): Fix formatting
1 parent 2f4d0eb commit ad4e999

File tree

2 files changed

+23
-44
lines changed

2 files changed

+23
-44
lines changed

SideBot/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
# pylint: disable=C0103,C0114
44
import logging
5-
import pathlib
65
import typing
76

87
import yaml
@@ -99,5 +98,5 @@ def run(
9998

10099
@classmethod
101100
def from_yaml_file(cls, path: str = "conf.yaml") -> "SideBot":
102-
with open(path, 'r') as f:
101+
with open(path, "r") as f:
103102
return cls(yaml.safe_load(f))

SideBot/utils/__init__.py

Lines changed: 22 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,10 @@
55

66
class DBConfig:
77
"""DBConfig class for Postgresql with Bot"""
8-
__slot__ = ('user', 'password', 'host', 'port', 'name')
9-
10-
def __init__(
11-
self,
12-
user: str,
13-
password: str,
14-
host: str,
15-
port: int | None = None,
16-
name: str | None = None
17-
):
8+
9+
__slot__ = ("user", "password", "host", "port", "name")
10+
11+
def __init__(self, user: str, password: str, host: str, port: int | None = None, name: str | None = None):
1812
self.user = user
1913
self.password = password
2014
self.host = host
@@ -28,54 +22,40 @@ def connect_str(self):
2822
@property
2923
def as_dict(self):
3024
return {
31-
'user': self.user,
32-
'pass': self.password,
33-
'host': self.host,
34-
'port': self.port,
35-
'name': self.name,
25+
"user": self.user,
26+
"pass": self.password,
27+
"host": self.host,
28+
"port": self.port,
29+
"name": self.name,
3630
}
3731

3832
@classmethod
3933
def from_dict(cls, data: dict):
4034
return cls(
41-
data['user'],
42-
data['pass'],
43-
data['host'],
44-
data['port'] if 'port' in data else None,
45-
data['name'] if 'name' in data else data['user']
35+
data["user"],
36+
data["pass"],
37+
data["host"],
38+
data["port"] if "port" in data else None,
39+
data["name"] if "name" in data else data["user"],
4640
)
4741

42+
4843
class BotConfig:
4944
"""BotConfig class for SideBot"""
50-
__slots__ = ('token', 'owner', 'db_url', 'cogs')
51-
52-
def __init__(
53-
self,
54-
token: str,
55-
owner: int,
56-
db_url: str,
57-
cogs: list[str]
58-
):
45+
46+
__slots__ = ("token", "owner", "db_url", "cogs")
47+
48+
def __init__(self, token: str, owner: int, db_url: str, cogs: list[str]):
5949
self.token = token
6050
self.owner = owner
6151
self.db_url = db_url
6252
self.cogs = cogs
6353

6454
@classmethod
6555
def from_dict(cls, data: dict):
66-
if 'botDB' in data:
67-
return cls(
68-
data['discordToken'],
69-
data['owner'],
70-
DBConfig.from_dict(data['botDB']).connect_str,
71-
data['cogs']
72-
)
73-
return cls(
74-
data['discordToken'],
75-
data['owner'],
76-
data['botDBURL'],
77-
data['cogs']
78-
)
56+
if "botDB" in data:
57+
return cls(data["discordToken"], data["owner"], DBConfig.from_dict(data["botDB"]).connect_str, data["cogs"])
58+
return cls(data["discordToken"], data["owner"], data["botDBURL"], data["cogs"])
7959

8060

8161
class DiscordUser:

0 commit comments

Comments
 (0)