Skip to content

Refactor timeout and body handling to use match statements #3112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamtheturtle merged 3 commits into from
Apr 15, 2026
Merged

Refactor timeout and body handling to use match statements #3112

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
371555a
Refactor timeout and body handling to use match statements
adamtheturtle Apr 15, 2026
b4cfed0
Use wildcard case for body to preserve original fallthrough behavior
adamtheturtle Apr 15, 2026
3d57724
Handle (connect, None) timeout tuples correctly
adamtheturtle Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/mock_vws/_requests_mock_server/decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,23 +167,25 @@ def wrapped(
# requests allows timeout as a (connect, read)
# tuple. The delay simulates server response
# time, so compare against the read timeout.
if isinstance(timeout, tuple):
timeout = timeout[1]
effective: float | None = None
if isinstance(timeout, (int, float)):
effective = float(timeout)
match timeout:
case (_, int() | float() as read_timeout):
effective: float | None = float(read_timeout)
case int() | float():
effective = float(timeout)
case _:
effective = None
Comment thread
cursor[bot] marked this conversation as resolved.

if effective is not None and delay_seconds > effective:
sleep_fn(effective)
raise requests.exceptions.Timeout

raw_body = request.body
if raw_body is None:
body_bytes = b""
elif isinstance(raw_body, str):
body_bytes = raw_body.encode(encoding="utf-8")
else:
body_bytes = raw_body
match request.body:
case None:
body_bytes = b""
case str() as raw_body:
body_bytes = raw_body.encode(encoding="utf-8")
case _:
body_bytes = request.body

path = request.path_url
if base_path and path.startswith(base_path):
Expand Down
Loading