Skip to content
Closed
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
22 changes: 15 additions & 7 deletions playwright/_impl/_fetch.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
async_readfile,
async_writefile,
is_file_payload,
is_file_array_payload,
locals_to_params,
object_to_array,
to_impl,
Expand Down Expand Up @@ -381,13 +382,12 @@ async def _inner_fetch(
# Convert file-like values to ServerFilePayload structs.
for name, value in multipart.items():
if is_file_payload(value):
payload = cast(FilePayload, value)
assert isinstance(
payload["buffer"], bytes
), f"Unexpected buffer type of 'data.{name}'"
multipart_data.append(
FormField(name=name, file=file_payload_to_json(payload))
)
file_payload_json = get_file_payload(name, value)
multipart_data.append(FormField(name=name, file=file_payload_json))
elif is_file_array_payload(value):
for value_item in value:
file_payload_json = get_file_payload(name, value_item)
multipart_data.append(FormField(name=name, file=file_payload_json))
elif isinstance(value, str):
multipart_data.append(FormField(name=name, value=value))
if (
Expand Down Expand Up @@ -435,6 +435,14 @@ async def storage_state(
return result


def get_file_payload(name: str, value: Optional[Any]):
payload = cast(FilePayload, value)
assert isinstance(
payload["buffer"], bytes
), f"Unexpected buffer type of 'data.{name}', filename='{payload.filename}'"
return file_payload_to_json(payload)


def file_payload_to_json(payload: FilePayload) -> ServerFilePayload:
return ServerFilePayload(
name=payload["name"],
Expand Down
7 changes: 7 additions & 0 deletions playwright/_impl/_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,13 @@ def is_file_payload(value: Optional[Any]) -> bool:
)


def is_file_array_payload(value: Optional[Any]) -> bool:
return (
isinstance(value, list)
and all(is_file_payload(x) for x in value)
)


TEXTUAL_MIME_TYPE = re.compile(
r"^(text\/.*?|application\/(json|(x-)?javascript|xml.*?|ecmascript|graphql|x-www-form-urlencoded)|image\/svg(\+xml)?|application\/.*?(\+json|\+xml))(;\s*charset=.*)?$"
)
Expand Down