fastapi 0.115.3__tar.gz → 0.115.4__tar.gz

{fastapi-0.115.3 → fastapi-0.115.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi
-Version: 0.115.3
+Version: 0.115.4
 Summary: FastAPI framework, high performance, easy to learn, fast to code, ready for production
 Author-Email: =?utf-8?q?Sebasti=C3=A1n_Ram=C3=ADrez?= <tiangolo@gmail.com>
 Classifier: Intended Audience :: Information Technology

{fastapi-0.115.3 → fastapi-0.115.4}/fastapi/__init__.py

@@ -1,6 +1,6 @@
 """FastAPI framework, high performance, easy to learn, fast to code, ready for production"""
 
-__version__ = "0.115.3"
+__version__ = "0.115.4"
 
 from starlette import status as status
 

{fastapi-0.115.3 → fastapi-0.115.4}/fastapi/dependencies/utils.py

@@ -90,21 +90,29 @@ multipart_incorrect_install_error = (
 
 def ensure_multipart_is_installed() -> None:
     try:
-        # __version__ is available in both multiparts, and can be mocked
-        from multipart import __version__
+        from python_multipart import __version__
 
-        assert __version__
+        # Import an attribute that can be mocked/deleted in testing
+        assert __version__ > "0.0.12"
+    except (ImportError, AssertionError):
         try:
-            # parse_options_header is only available in the right multipart
-            from multipart.multipart import parse_options_header
+            # __version__ is available in both multiparts, and can be mocked
+            from multipart import __version__  # type: ignore[no-redef,import-untyped]
 
-            assert parse_options_header  # type: ignore[truthy-function]
+            assert __version__
+            try:
+                # parse_options_header is only available in the right multipart
+                from multipart.multipart import (  # type: ignore[import-untyped]
+                    parse_options_header,
+                )
+
+                assert parse_options_header
+            except ImportError:
+                logger.error(multipart_incorrect_install_error)
+                raise RuntimeError(multipart_incorrect_install_error) from None
         except ImportError:
-            logger.error(multipart_incorrect_install_error)
-            raise RuntimeError(multipart_incorrect_install_error) from None
-    except ImportError:
-        logger.error(multipart_not_installed_error)
-        raise RuntimeError(multipart_not_installed_error) from None
+            logger.error(multipart_not_installed_error)
+            raise RuntimeError(multipart_not_installed_error) from None
 
 
 def get_param_sub_dependant(

{fastapi-0.115.3 → fastapi-0.115.4}/fastapi/param_functions.py

@@ -2298,7 +2298,7 @@ def Security(  # noqa: N802
             dependency.
 
             The term "scope" comes from the OAuth2 specification, it seems to be
-            intentionaly vague and interpretable. It normally refers to permissions,
+            intentionally vague and interpretable. It normally refers to permissions,
             in cases to roles.
 
             These scopes are integrated with OpenAPI (and the API docs at `/docs`).

{fastapi-0.115.3 → fastapi-0.115.4}/fastapi/security/oauth2.py

@@ -52,7 +52,7 @@ class OAuth2PasswordRequestForm:
     ```
 
     Note that for OAuth2 the scope `items:read` is a single scope in an opaque string.
-    You could have custom internal logic to separate it by colon caracters (`:`) or
+    You could have custom internal logic to separate it by colon characters (`:`) or
     similar, and get the two parts `items` and `read`. Many applications do that to
     group and organize permissions, you could do it as well in your application, just
     know that that it is application specific, it's not part of the specification.
@@ -194,7 +194,7 @@ class OAuth2PasswordRequestFormStrict(OAuth2PasswordRequestForm):
     ```
 
     Note that for OAuth2 the scope `items:read` is a single scope in an opaque string.
-    You could have custom internal logic to separate it by colon caracters (`:`) or
+    You could have custom internal logic to separate it by colon characters (`:`) or
     similar, and get the two parts `items` and `read`. Many applications do that to
     group and organize permissions, you could do it as well in your application, just
     know that that it is application specific, it's not part of the specification.

{fastapi-0.115.3 → fastapi-0.115.4}/pyproject.toml

@@ -47,7 +47,7 @@ dependencies = [
     "pydantic>=1.7.4,!=1.8,!=1.8.1,!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0",
     "typing-extensions>=4.8.0",
 ]
-version = "0.115.3"
+version = "0.115.4"
 
 [project.urls]
 Homepage = "https://github.com/fastapi/fastapi"

fastapi-0.115.4/tests/test_multipart_installation.py

@@ -0,0 +1,149 @@
+import warnings
+
+import pytest
+from fastapi import FastAPI, File, Form, UploadFile
+from fastapi.dependencies.utils import (
+    multipart_incorrect_install_error,
+    multipart_not_installed_error,
+)
+
+
+def test_incorrect_multipart_installed_form(monkeypatch):
+    monkeypatch.setattr("python_multipart.__version__", "0.0.12")
+    with warnings.catch_warnings(record=True):
+        warnings.simplefilter("always")
+        monkeypatch.delattr("multipart.multipart.parse_options_header", raising=False)
+    with pytest.raises(RuntimeError, match=multipart_incorrect_install_error):
+        app = FastAPI()
+
+        @app.post("/")
+        async def root(username: str = Form()):
+            return username  # pragma: nocover
+
+
+def test_incorrect_multipart_installed_file_upload(monkeypatch):
+    monkeypatch.setattr("python_multipart.__version__", "0.0.12")
+    with warnings.catch_warnings(record=True):
+        warnings.simplefilter("always")
+        monkeypatch.delattr("multipart.multipart.parse_options_header", raising=False)
+    with pytest.raises(RuntimeError, match=multipart_incorrect_install_error):
+        app = FastAPI()
+
+        @app.post("/")
+        async def root(f: UploadFile = File()):
+            return f  # pragma: nocover
+
+
+def test_incorrect_multipart_installed_file_bytes(monkeypatch):
+    monkeypatch.setattr("python_multipart.__version__", "0.0.12")
+    with warnings.catch_warnings(record=True):
+        warnings.simplefilter("always")
+        monkeypatch.delattr("multipart.multipart.parse_options_header", raising=False)
+    with pytest.raises(RuntimeError, match=multipart_incorrect_install_error):
+        app = FastAPI()
+
+        @app.post("/")
+        async def root(f: bytes = File()):
+            return f  # pragma: nocover
+
+
+def test_incorrect_multipart_installed_multi_form(monkeypatch):
+    monkeypatch.setattr("python_multipart.__version__", "0.0.12")
+    with warnings.catch_warnings(record=True):
+        warnings.simplefilter("always")
+        monkeypatch.delattr("multipart.multipart.parse_options_header", raising=False)
+    with pytest.raises(RuntimeError, match=multipart_incorrect_install_error):
+        app = FastAPI()
+
+        @app.post("/")
+        async def root(username: str = Form(), password: str = Form()):
+            return username  # pragma: nocover
+
+
+def test_incorrect_multipart_installed_form_file(monkeypatch):
+    monkeypatch.setattr("python_multipart.__version__", "0.0.12")
+    with warnings.catch_warnings(record=True):
+        warnings.simplefilter("always")
+        monkeypatch.delattr("multipart.multipart.parse_options_header", raising=False)
+    with pytest.raises(RuntimeError, match=multipart_incorrect_install_error):
+        app = FastAPI()
+
+        @app.post("/")
+        async def root(username: str = Form(), f: UploadFile = File()):
+            return username  # pragma: nocover
+
+
+def test_no_multipart_installed(monkeypatch):
+    monkeypatch.setattr("python_multipart.__version__", "0.0.12")
+    with warnings.catch_warnings(record=True):
+        warnings.simplefilter("always")
+        monkeypatch.delattr("multipart.__version__", raising=False)
+        with pytest.raises(RuntimeError, match=multipart_not_installed_error):
+            app = FastAPI()
+
+            @app.post("/")
+            async def root(username: str = Form()):
+                return username  # pragma: nocover
+
+
+def test_no_multipart_installed_file(monkeypatch):
+    monkeypatch.setattr("python_multipart.__version__", "0.0.12")
+    with warnings.catch_warnings(record=True):
+        warnings.simplefilter("always")
+        monkeypatch.delattr("multipart.__version__", raising=False)
+        with pytest.raises(RuntimeError, match=multipart_not_installed_error):
+            app = FastAPI()
+
+            @app.post("/")
+            async def root(f: UploadFile = File()):
+                return f  # pragma: nocover
+
+
+def test_no_multipart_installed_file_bytes(monkeypatch):
+    monkeypatch.setattr("python_multipart.__version__", "0.0.12")
+    with warnings.catch_warnings(record=True):
+        warnings.simplefilter("always")
+        monkeypatch.delattr("multipart.__version__", raising=False)
+        with pytest.raises(RuntimeError, match=multipart_not_installed_error):
+            app = FastAPI()
+
+            @app.post("/")
+            async def root(f: bytes = File()):
+                return f  # pragma: nocover
+
+
+def test_no_multipart_installed_multi_form(monkeypatch):
+    monkeypatch.setattr("python_multipart.__version__", "0.0.12")
+    with warnings.catch_warnings(record=True):
+        warnings.simplefilter("always")
+        monkeypatch.delattr("multipart.__version__", raising=False)
+        with pytest.raises(RuntimeError, match=multipart_not_installed_error):
+            app = FastAPI()
+
+            @app.post("/")
+            async def root(username: str = Form(), password: str = Form()):
+                return username  # pragma: nocover
+
+
+def test_no_multipart_installed_form_file(monkeypatch):
+    monkeypatch.setattr("python_multipart.__version__", "0.0.12")
+    with warnings.catch_warnings(record=True):
+        warnings.simplefilter("always")
+        monkeypatch.delattr("multipart.__version__", raising=False)
+        with pytest.raises(RuntimeError, match=multipart_not_installed_error):
+            app = FastAPI()
+
+            @app.post("/")
+            async def root(username: str = Form(), f: UploadFile = File()):
+                return username  # pragma: nocover
+
+
+def test_old_multipart_installed(monkeypatch):
+    monkeypatch.setattr("python_multipart.__version__", "0.0.12")
+    with warnings.catch_warnings(record=True):
+        warnings.simplefilter("always")
+        app = FastAPI()
+
+        @app.post("/")
+        async def root(username: str = Form()):
+            return username  # pragma: nocover

fastapi-0.115.3/tests/test_multipart_installation.py

@@ -1,106 +0,0 @@
-import pytest
-from fastapi import FastAPI, File, Form, UploadFile
-from fastapi.dependencies.utils import (
-    multipart_incorrect_install_error,
-    multipart_not_installed_error,
-)
-
-
-def test_incorrect_multipart_installed_form(monkeypatch):
-    monkeypatch.delattr("multipart.multipart.parse_options_header", raising=False)
-    with pytest.raises(RuntimeError, match=multipart_incorrect_install_error):
-        app = FastAPI()
-
-        @app.post("/")
-        async def root(username: str = Form()):
-            return username  # pragma: nocover
-
-
-def test_incorrect_multipart_installed_file_upload(monkeypatch):
-    monkeypatch.delattr("multipart.multipart.parse_options_header", raising=False)
-    with pytest.raises(RuntimeError, match=multipart_incorrect_install_error):
-        app = FastAPI()
-
-        @app.post("/")
-        async def root(f: UploadFile = File()):
-            return f  # pragma: nocover
-
-
-def test_incorrect_multipart_installed_file_bytes(monkeypatch):
-    monkeypatch.delattr("multipart.multipart.parse_options_header", raising=False)
-    with pytest.raises(RuntimeError, match=multipart_incorrect_install_error):
-        app = FastAPI()
-
-        @app.post("/")
-        async def root(f: bytes = File()):
-            return f  # pragma: nocover
-
-
-def test_incorrect_multipart_installed_multi_form(monkeypatch):
-    monkeypatch.delattr("multipart.multipart.parse_options_header", raising=False)
-    with pytest.raises(RuntimeError, match=multipart_incorrect_install_error):
-        app = FastAPI()
-
-        @app.post("/")
-        async def root(username: str = Form(), password: str = Form()):
-            return username  # pragma: nocover
-
-
-def test_incorrect_multipart_installed_form_file(monkeypatch):
-    monkeypatch.delattr("multipart.multipart.parse_options_header", raising=False)
-    with pytest.raises(RuntimeError, match=multipart_incorrect_install_error):
-        app = FastAPI()
-
-        @app.post("/")
-        async def root(username: str = Form(), f: UploadFile = File()):
-            return username  # pragma: nocover
-
-
-def test_no_multipart_installed(monkeypatch):
-    monkeypatch.delattr("multipart.__version__", raising=False)
-    with pytest.raises(RuntimeError, match=multipart_not_installed_error):
-        app = FastAPI()
-
-        @app.post("/")
-        async def root(username: str = Form()):
-            return username  # pragma: nocover
-
-
-def test_no_multipart_installed_file(monkeypatch):
-    monkeypatch.delattr("multipart.__version__", raising=False)
-    with pytest.raises(RuntimeError, match=multipart_not_installed_error):
-        app = FastAPI()
-
-        @app.post("/")
-        async def root(f: UploadFile = File()):
-            return f  # pragma: nocover
-
-
-def test_no_multipart_installed_file_bytes(monkeypatch):
-    monkeypatch.delattr("multipart.__version__", raising=False)
-    with pytest.raises(RuntimeError, match=multipart_not_installed_error):
-        app = FastAPI()
-
-        @app.post("/")
-        async def root(f: bytes = File()):
-            return f  # pragma: nocover
-
-
-def test_no_multipart_installed_multi_form(monkeypatch):
-    monkeypatch.delattr("multipart.__version__", raising=False)
-    with pytest.raises(RuntimeError, match=multipart_not_installed_error):
-        app = FastAPI()
-
-        @app.post("/")
-        async def root(username: str = Form(), password: str = Form()):
-            return username  # pragma: nocover
-
-
-def test_no_multipart_installed_form_file(monkeypatch):
-    monkeypatch.delattr("multipart.__version__", raising=False)
-    with pytest.raises(RuntimeError, match=multipart_not_installed_error):
-        app = FastAPI()
-
-        @app.post("/")
-        async def root(username: str = Form(), f: UploadFile = File()):
-            return username  # pragma: nocover