Skip to content
Open
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
16 changes: 15 additions & 1 deletion fastapi/dependencies/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,26 @@
)


def _version_str_to_tuple(version: str) -> tuple[int, ...]:
version_tuple = []
for part in version.split("."):
numeric_prefix = ""
for char in part:
if not char.isdigit():
break
numeric_prefix += char
if not numeric_prefix:
break
version_tuple.append(int(numeric_prefix))
return tuple(version_tuple)


def ensure_multipart_is_installed() -> None:
try:
from python_multipart import __version__

# Import an attribute that can be mocked/deleted in testing
assert __version__ > "0.0.12"
assert _version_str_to_tuple(__version__) > (0, 0, 12)
except (ImportError, AssertionError):
try:
# __version__ is available in both multiparts, and can be mocked
Expand Down
19 changes: 19 additions & 0 deletions tests/test_multipart_installation.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import pytest
from fastapi import FastAPI, File, Form, UploadFile
from fastapi.dependencies.utils import (
_version_str_to_tuple,
multipart_incorrect_install_error,
multipart_not_installed_error,
)
Expand Down Expand Up @@ -147,3 +148,21 @@ def test_old_multipart_installed(monkeypatch):
@app.post("/")
async def root(username: str = Form()):
return username # pragma: nocover


def test_new_multipart_version_without_multipart_alias(monkeypatch):
monkeypatch.setattr("python_multipart.__version__", "0.0.100")
with warnings.catch_warnings(record=True):
warnings.simplefilter("always")
app = FastAPI()

@app.post("/")
async def root(username: str = Form()):
return username # pragma: nocover


def test_version_str_to_tuple():
assert _version_str_to_tuple("0.0.12") == (0, 0, 12)
assert _version_str_to_tuple("0.0.100") == (0, 0, 100)
assert _version_str_to_tuple("1.2.3a1") == (1, 2, 3)
assert _version_str_to_tuple("") == ()