Skip to content

Commit 0b78c64

Browse files
authored
Enable ruff UP rules and apply fixes (#19)
1 parent c989f5d commit 0b78c64

File tree

5 files changed

+22
-13
lines changed

5 files changed

+22
-13
lines changed

pyproject.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,13 @@ line-length = 88
4747
target-version = "py38"
4848

4949
[tool.ruff.lint]
50-
select = ["E4", "E7", "E9", "F"]
50+
select = ["E4", "E7", "E9", "F", "UP"]
5151
ignore = []
5252

53+
54+
[tool.ruff.lint.per-file-ignores]
55+
"**/scripts/*" = ["UP"]
56+
5357
[tool.ruff.lint.isort]
5458
force-sort-within-sections = true
5559
known-first-party = ["aiontfy"]

src/pythonxbox/authentication/xal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ async def request_device_token(self) -> XADResponse:
134134

135135
if self.client_params.device_type.lower() == "android":
136136
# {decf45e4-945d-4379-b708-d4ee92c12d99}
137-
device_id = "{%s}" % device_id
137+
device_id = f"{{{device_id}}}"
138138
else:
139139
# iOSs
140140
# DECF45E4-945D-4379-B708-D4EE92C12D99

tests/test_message.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ async def test_get_conversation(respx_mock, xbl_client):
1919
route = respx_mock.get("https://xblmessaging.xboxlive.com").mock(
2020
return_value=Response(200, json=get_response_json("message_get_conversation"))
2121
)
22-
await xbl_client.message.get_conversation(
23-
"05907fa3-0000-0009-acbd-299772a90900"
24-
)
22+
await xbl_client.message.get_conversation("05907fa3-0000-0009-acbd-299772a90900")
2523

2624
assert route.called
2725

@@ -31,9 +29,7 @@ async def test_get_new_conversation(respx_mock, xbl_client):
3129
route = respx_mock.get("https://xblmessaging.xboxlive.com").mock(
3230
return_value=Response(200, json=get_response_json("message_new_conversation"))
3331
)
34-
await xbl_client.message.get_conversation(
35-
"05907fa3-0000-0009-acbd-299772a90900"
36-
)
32+
await xbl_client.message.get_conversation("05907fa3-0000-0009-acbd-299772a90900")
3733

3834
assert route.called
3935

tests/test_ratelimits.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ async def helper_reach_and_wait_for_burst(
147147
start_time,
148148
burst_limit: int,
149149
expected_counter: int,
150-
frozen_datetime: FrozenDateTimeFactory
150+
frozen_datetime: FrozenDateTimeFactory,
151151
):
152152
# Make as many requests as possible without exceeding the BURST limit.
153153
for _ in range(burst_limit):
@@ -178,6 +178,7 @@ async def helper_reach_and_wait_for_burst(
178178
@pytest.mark.asyncio
179179
async def test_ratelimits_exceeded_sustain_only(respx_mock, xbl_client):
180180
with freeze_time("2025-10-30T00:00:00-00:00") as frozen_datetime:
181+
181182
async def make_request():
182183
route = respx_mock.get("https://social.xboxlive.com").mock(
183184
return_value=Response(200, json=get_response_json("people_summary_own"))
@@ -197,22 +198,30 @@ async def make_request():
197198

198199
# Exceed the burst limit and wait for it to reset (10 requests)
199200
await helper_reach_and_wait_for_burst(
200-
make_request, start_time, burst_limit=burst_max_request_num, expected_counter=10, frozen_datetime=frozen_datetime
201+
make_request,
202+
start_time,
203+
burst_limit=burst_max_request_num,
204+
expected_counter=10,
205+
frozen_datetime=frozen_datetime,
201206
)
202207

203208
# Repeat: Exceed the burst limit and wait for it to reset (10 requests)
204209
# Counter (the sustain one will be returned)
205210
# For (CombinedRateLimit).get_counter(), the highest counter is returned. (sustain in this case)
206211
await helper_reach_and_wait_for_burst(
207-
make_request, start_time, burst_limit=burst_max_request_num, expected_counter=20, frozen_datetime=frozen_datetime
212+
make_request,
213+
start_time,
214+
burst_limit=burst_max_request_num,
215+
expected_counter=20,
216+
frozen_datetime=frozen_datetime,
208217
)
209218

210219
# Now, make the rest of the requests (10 left, 20/30 done!)
211220
for _ in range(10):
212221
await make_request()
213222

214223
# Wait for the burst limit to 'reset'.
215-
frozen_datetime.tick(timedelta(seconds=TimePeriod.BURST.value+1))
224+
frozen_datetime.tick(timedelta(seconds=TimePeriod.BURST.value + 1))
216225
# Now, we have made 30 requests.
217226
# The counters should be as follows:
218227
# - BURST: 0* (will reset on next check)

tests/test_request_signer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def test_synthetic_verify_digest(
8484
signature = base64.b64decode(
8585
"Fe3R7GuZfvGA350cH7hWgg4HIHjaD9lGYiwxki6bNyGnB8dMEIfEmBiuNuGUfWjY5lL2h44X/VMGOkPIezVb7Q=="
8686
)
87-
invalid_signature = b"\xFF" + bytes(signature)[1:]
87+
invalid_signature = b"\xff" + bytes(signature)[1:]
8888
success = synthetic_request_signer.verify_digest(signature, message)
8989
success_via_vk = synthetic_request_signer.verify_digest(
9090
signature, message, ecdsa_verifying_key

0 commit comments

Comments
 (0)