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
21 changes: 9 additions & 12 deletions python_multipart/multipart.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,17 @@ class MultipartCallbacks(TypedDict, total=False):
on_headers_finished: Callable[[], None]
on_end: Callable[[], None]

class FormParserConfig(TypedDict):
UPLOAD_DIR: str | None
UPLOAD_KEEP_FILENAME: bool
UPLOAD_KEEP_EXTENSIONS: bool
UPLOAD_ERROR_ON_BAD_CTE: bool
MAX_MEMORY_FILE_SIZE: int
MAX_BODY_SIZE: float

class FileConfig(TypedDict, total=False):
UPLOAD_DIR: str | bytes | None
UPLOAD_DELETE_TMP: bool
UPLOAD_KEEP_FILENAME: bool
UPLOAD_KEEP_EXTENSIONS: bool
MAX_MEMORY_FILE_SIZE: int

class FormParserConfig(FileConfig):
UPLOAD_ERROR_ON_BAD_CTE: bool
MAX_BODY_SIZE: float

class _FormProtocol(Protocol):
def write(self, data: bytes) -> int: ...

Expand Down Expand Up @@ -1488,8 +1484,8 @@ class FormParser:
information about the uploaded file. In such cases, you can provide the file name of the uploaded file
manually.
FileClass: The class to use for uploaded files. Defaults to :class:`File`, but you can provide your own class
if you wish to customize behaviour. The class will be instantiated as FileClass(file_name, field_name), and
it must provide the following functions::
if you wish to customize behaviour. The class will be instantiated as
FileClass(file_name, field_name, config=config), and it must provide the following functions::
- file_instance.write(data)
- file_instance.finalize()
- file_instance.close()
Expand All @@ -1510,6 +1506,7 @@ class if you wish to customize behaviour. The class will be instantiated as Fie
"MAX_BODY_SIZE": float("inf"),
"MAX_MEMORY_FILE_SIZE": 1 * 1024 * 1024,
"UPLOAD_DIR": None,
"UPLOAD_DELETE_TMP": True,
"UPLOAD_KEEP_FILENAME": False,
"UPLOAD_KEEP_EXTENSIONS": False,
# Error on invalid Content-Transfer-Encoding?
Expand Down Expand Up @@ -1557,7 +1554,7 @@ def __init__(

def on_start() -> None:
nonlocal file
file = FileClass(file_name, None, config=cast("FileConfig", self.config))
file = FileClass(file_name, None, config=self.config)

def on_data(data: bytes, start: int, end: int) -> None:
nonlocal file
Expand Down Expand Up @@ -1695,7 +1692,7 @@ def on_headers_finished() -> None:
if file_name is None:
f_multi = FieldClass(field_name)
else:
f_multi = FileClass(file_name, field_name, config=cast("FileConfig", self.config))
f_multi = FileClass(file_name, field_name, config=self.config)
is_file = True

# Parse the given Content-Transfer-Encoding to determine what
Expand Down
25 changes: 25 additions & 0 deletions tests/test_multipart.py
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,31 @@ def test_random_splitting(self) -> None:
self.assert_field(b"field", b"test1")
self.assert_file(b"file", b"file.txt", b"test2")

def test_upload_delete_tmp_config(self) -> None:
with tempfile.TemporaryDirectory() as upload_dir:
self.make(
"----WebKitFormBoundary5BZGOJCWtXGYC9HW",
config={"UPLOAD_DIR": upload_dir, "UPLOAD_DELETE_TMP": False, "MAX_MEMORY_FILE_SIZE": 1},
)

test_file = "single_file.http"
with open(os.path.join(http_tests_dir, test_file), "rb") as f:
test_data = f.read()

self.f.write(test_data)
self.f.finalize()

self.assertEqual(len(self.files), 1)
uploaded_file = self.files[0]
assert uploaded_file.actual_file_name is not None
actual_file_name = uploaded_file.actual_file_name.decode(sys.getfilesystemencoding())
uploaded_file.close()

try:
self.assertTrue(os.path.exists(actual_file_name))
finally:
os.unlink(actual_file_name)

@parametrize("param", [t for t in http_tests if t["name"] in single_byte_tests])
def test_feed_single_bytes(self, param: TestParams) -> None:
"""
Expand Down
Loading