Skip to content

Commit 51ff1a4

Browse files
authored
Finalize transfer decoding before callbacks (#336)
1 parent 212819d commit 51ff1a4

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

‎python_multipart/multipart.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,9 +1759,9 @@ def on_part_data(data: bytes, start: int, end: int) -> None:
17591759
# TODO: check for error here.
17601760

17611761
def on_part_end() -> None:
1762-
nonlocal f_multi, is_file
17631762
assert f_multi is not None
1764-
f_multi.finalize()
1763+
assert writer is not None
1764+
writer.finalize()
17651765
if is_file:
17661766
if on_file:
17671767
assert isinstance(f_multi, File)
@@ -1833,9 +1833,6 @@ def on_headers_finished() -> None:
18331833
writer = f_multi
18341834

18351835
def _on_end() -> None:
1836-
nonlocal writer
1837-
if writer is not None:
1838-
writer.finalize()
18391836
if self.on_end is not None:
18401837
self.on_end()
18411838

‎tests/test_multipart.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,20 @@ def test_content_transfer_encoding_is_case_insensitive(content_transfer_encoding
854854
assert file.file_object.read() == b"Test"
855855

856856

857+
def test_finalizes_transfer_encoding_before_callback() -> None:
858+
data = (
859+
b'--b\r\nContent-Disposition: form-data; name="f"\r\n'
860+
b"Content-Transfer-Encoding: quoted-printable\r\n\r\n=4\r\n--b--\r\n"
861+
)
862+
values: list[bytes | None] = []
863+
parser = FormParser("multipart/form-data", lambda field: values.append(field.value), None, boundary=b"b")
864+
865+
parser.write(data)
866+
parser.finalize()
867+
868+
assert values == [b"=4"]
869+
870+
857871
def test_parser_states_remain_enum_members() -> None:
858872
multipart_parser = MultipartParser(b"boundary")
859873
multipart_parser.write(b"--boundary--\r\n")

0 commit comments

Comments
 (0)