Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGES/12170.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed race condition in ``test_data_file`` on Python 3.14 free-threaded builds -- by :user:`rodrigobnogueira`.
5 changes: 3 additions & 2 deletions aiohttp/formdata.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import io
from collections import deque
from collections.abc import Iterable
from typing import Any
from urllib.parse import urlencode
Expand Down Expand Up @@ -81,10 +82,10 @@ def add_field(
self._fields.append((type_options, headers, value))

def add_fields(self, *fields: Any) -> None:
to_add = list(fields)
to_add: deque[Any] = deque(fields)

while to_add:
rec = to_add.pop(0)
rec = to_add.popleft()

if isinstance(rec, io.IOBase):
k = guess_filename(rec, "unknown")
Expand Down
13 changes: 12 additions & 1 deletion tests/test_client_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -1352,7 +1352,18 @@ async def test_data_file(
assert isinstance(req.body, payload.BufferedReaderPayload)
assert req.headers["TRANSFER-ENCODING"] == "chunked"

resp = await req._send(conn)
original_write_bytes = req._write_bytes

async def _mock_write_bytes(
writer: AbstractStreamWriter, conn: mock.Mock, content_length: int | None
) -> None:
# Ensure the task is scheduled so _writer isn't None
await asyncio.sleep(0)
await original_write_bytes(writer, conn, content_length)

with mock.patch.object(req, "_write_bytes", _mock_write_bytes):
resp = await req._send(conn)

assert asyncio.isfuture(req._writer)
await resp.wait_for_close()

Expand Down
Loading