Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit bad612b

Browse files
committedFeb 18, 2025··
refactor: use walrus operator
1 parent ef7aba9 commit bad612b

File tree

3 files changed

+23
-26
lines changed

3 files changed

+23
-26
lines changed
 

‎topgg/autopost.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ def _fut_done_callback(self, future: "asyncio.Future") -> None:
255255

256256
async def _internal_loop(self) -> None:
257257
try:
258-
while 1:
258+
while True:
259259
stats = await self.client._invoke_callback(self._stats)
260260
try:
261261
await self.client.post_guild_count(stats)

‎topgg/ratelimiter.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ async def __aenter__(self) -> "AsyncRateLimiter":
6565
until = time() + self.period - self._timespan
6666
if self.callback:
6767
asyncio.ensure_future(self.callback(until))
68-
sleep_time = until - time()
69-
if sleep_time > 0:
68+
elif (sleep_time := until - time()) > 0:
7069
await asyncio.sleep(sleep_time)
7170
return self
7271

@@ -97,7 +96,9 @@ def __init__(self, rate_limiters: List[AsyncRateLimiter]):
9796
self.rate_limiters = rate_limiters
9897

9998
async def __aenter__(self) -> "AsyncRateLimiterManager":
100-
[await manager.__aenter__() for manager in self.rate_limiters]
99+
for manager in self.rate_limiters:
100+
await manager.__aenter__()
101+
101102
return self
102103

103104
async def __aexit__(
@@ -106,4 +107,4 @@ async def __aexit__(
106107
exc_val: BaseException,
107108
exc_tb: TracebackType,
108109
) -> None:
109-
await asyncio.gather(*[manager.__aexit__(exc_type, exc_val, exc_tb) for manager in self.rate_limiters])
110+
await asyncio.gather(*(manager.__aexit__(exc_type, exc_val, exc_tb) for manager in self.rate_limiters))

‎topgg/types.py

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ def camel_to_snake(string: str) -> str:
4141
def parse_vote_dict(d: dict) -> dict:
4242
data = d.copy()
4343

44-
query = data.get("query", "").lstrip("?")
45-
if query:
44+
if query := data.get("query", "").lstrip("?"):
4645
query_dict = {k: v for k, v in [pair.split("=") for pair in query.split("&")]}
4746
data["query"] = DataDict(**query_dict)
4847
else:
@@ -55,8 +54,7 @@ def parse_vote_dict(d: dict) -> dict:
5554
data["guild"] = int(data["guild"])
5655

5756
for key, value in data.copy().items():
58-
converted_key = camel_to_snake(key)
59-
if key != converted_key:
57+
if key != (converted_key := camel_to_snake(key)):
6058
del data[key]
6159
data[converted_key] = value
6260

@@ -67,20 +65,17 @@ def parse_dict(d: dict) -> dict:
6765
data = d.copy()
6866

6967
for key, value in data.copy().items():
70-
if "id" in key.lower():
71-
if value == "":
72-
value = None
73-
else:
74-
if isinstance(value, str) and value.isdigit():
75-
value = int(value)
76-
else:
77-
continue
78-
elif value == "":
68+
if value == "":
7969
value = None
70+
elif "id" in key.lower():
71+
if isinstance(value, str) and value.isdigit():
72+
value = int(value)
73+
else:
74+
continue
8075

81-
converted_key = camel_to_snake(key)
82-
if key != converted_key:
76+
if key != (converted_key := camel_to_snake(key)):
8377
del data[key]
78+
8479
data[converted_key] = value
8580

8681
return data
@@ -89,13 +84,14 @@ def parse_dict(d: dict) -> dict:
8984
def parse_bot_dict(d: dict) -> dict:
9085
data = parse_dict(d.copy())
9186

92-
if data.get("date") and not isinstance(data["date"], datetime):
93-
data["date"] = datetime.fromisoformat(data["date"].replace("Z", "+00:00"))
87+
if (date := data.get("date")) and not isinstance(date, datetime):
88+
data["date"] = datetime.fromisoformat(date.replace("Z", "+00:00"))
89+
90+
if owners := data.get("owners"):
91+
data["owners"] = [int(e) for e in owners]
9492

95-
if data.get("owners"):
96-
data["owners"] = [int(e) for e in data["owners"]]
97-
if data.get("guilds"):
98-
data["guilds"] = [int(e) for e in data["guilds"]]
93+
# TODO: remove this soon
94+
data["guilds"] = []
9995

10096
for key, value in data.copy().items():
10197
converted_key = camel_to_snake(key)

0 commit comments

Comments
 (0)
Please sign in to comment.