Browse Source

🎨 [pre-commit.ci] Auto format from pre-commit.com hooks

pull/12529/head
pre-commit-ci[bot] 9 months ago
parent
commit
f9ca77e1ec
  1. 2
      fastapi/dependencies/utils.py
  2. 25
      tests/test_lifespan_scoped_dependencies/test_endpoint_usage.py

2
fastapi/dependencies/utils.py

@ -83,7 +83,7 @@ from starlette.datastructures import (
from starlette.requests import HTTPConnection, Request from starlette.requests import HTTPConnection, Request
from starlette.responses import Response from starlette.responses import Response
from starlette.websockets import WebSocket from starlette.websockets import WebSocket
from typing_extensions import Annotated, assert_never, get_args, get_origin from typing_extensions import Annotated, get_args, get_origin
multipart_not_installed_error = ( multipart_not_installed_error = (
'Form data requires "python-multipart" to be installed. \n' 'Form data requires "python-multipart" to be installed. \n'

25
tests/test_lifespan_scoped_dependencies/test_endpoint_usage.py

@ -4,8 +4,6 @@ from time import sleep
from typing import Any, AsyncGenerator, Dict, List, Tuple from typing import Any, AsyncGenerator, Dict, List, Tuple
import pytest import pytest
from setuptools import depends
from fastapi import ( from fastapi import (
APIRouter, APIRouter,
BackgroundTasks, BackgroundTasks,
@ -30,7 +28,7 @@ from fastapi.exceptions import (
from fastapi.params import Security from fastapi.params import Security
from fastapi.security import SecurityScopes from fastapi.security import SecurityScopes
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from typing_extensions import Annotated, Literal, assert_never from typing_extensions import Annotated, Literal
from tests.test_lifespan_scoped_dependencies.testing_utilities import ( from tests.test_lifespan_scoped_dependencies.testing_utilities import (
DependencyFactory, DependencyFactory,
@ -614,7 +612,6 @@ def test_lifespan_scoped_dependency_can_be_used_alongside_custom_lifespans(
app = FastAPI(on_startup=[startup], on_shutdown=[shutdown]) app = FastAPI(on_startup=[startup], on_shutdown=[shutdown])
dependency_factory = DependencyFactory(dependency_style) dependency_factory = DependencyFactory(dependency_style)
create_endpoint_1_annotation( create_endpoint_1_annotation(
@ -742,10 +739,7 @@ def test_endpoints_report_incorrect_dependency_scope_at_router_scope(
): ):
dependency_factory = DependencyFactory(DependencyStyle.ASYNC_GENERATOR) dependency_factory = DependencyFactory(DependencyStyle.ASYNC_GENERATOR)
depends = Depends( depends = Depends(dependency_factory.get_dependency(), dependency_scope="lifespan")
dependency_factory.get_dependency(),
dependency_scope="lifespan"
)
# We intentionally change the dependency scope here to bypass the # We intentionally change the dependency scope here to bypass the
# validation at the function level. # validation at the function level.
@ -757,7 +751,6 @@ def test_endpoints_report_incorrect_dependency_scope_at_router_scope(
else: else:
router = APIRouter(dependencies=[depends]) router = APIRouter(dependencies=[depends])
with pytest.raises(InvalidDependencyScope): with pytest.raises(InvalidDependencyScope):
create_endpoint_0_annotations( create_endpoint_0_annotations(
router=router, router=router,
@ -903,15 +896,16 @@ def test_bad_lifespan_scoped_dependencies(
assert exception_info.value.args == (1,) assert exception_info.value.args == (1,)
def test_endpoint_dependant_backwards_compatibility(): def test_endpoint_dependant_backwards_compatibility():
dependency_factory = DependencyFactory(DependencyStyle.ASYNC_GENERATOR) dependency_factory = DependencyFactory(DependencyStyle.ASYNC_GENERATOR)
def endpoint( def endpoint(
dependency1: Annotated[int, Depends(dependency_factory.get_dependency())], dependency1: Annotated[int, Depends(dependency_factory.get_dependency())],
dependency2: Annotated[int, Depends( dependency2: Annotated[
dependency_factory.get_dependency(), int,
dependency_scope="lifespan" Depends(dependency_factory.get_dependency(), dependency_scope="lifespan"),
)], ],
): ):
pass # pragma: nocover pass # pragma: nocover
@ -922,6 +916,5 @@ def test_endpoint_dependant_backwards_compatibility():
) )
assert dependant.dependencies == tuple( assert dependant.dependencies == tuple(
dependant.lifespan_dependencies + dependant.lifespan_dependencies + dependant.endpoint_dependencies
dependant.endpoint_dependencies )
)

Loading…
Cancel
Save