From 8a5c3fe56bc4453bd3b86fc0bccf04b5b2dab5a2 Mon Sep 17 00:00:00 2001 From: Nir Schulman Date: Sat, 9 Nov 2024 12:34:18 +0200 Subject: [PATCH] Fixed more linting --- fastapi/dependencies/utils.py | 2 +- .../test_endpoint_usage.py | 25 +++++++------------ 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py index 94e983e1e..bd1a0dc50 100644 --- a/fastapi/dependencies/utils.py +++ b/fastapi/dependencies/utils.py @@ -83,7 +83,7 @@ from starlette.datastructures import ( from starlette.requests import HTTPConnection, Request from starlette.responses import Response 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 = ( 'Form data requires "python-multipart" to be installed. \n' diff --git a/tests/test_lifespan_scoped_dependencies/test_endpoint_usage.py b/tests/test_lifespan_scoped_dependencies/test_endpoint_usage.py index 65c3c2dc1..7e6c80d0e 100644 --- a/tests/test_lifespan_scoped_dependencies/test_endpoint_usage.py +++ b/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 import pytest -from setuptools import depends - from fastapi import ( APIRouter, BackgroundTasks, @@ -30,7 +28,7 @@ from fastapi.exceptions import ( from fastapi.params import Security from fastapi.security import SecurityScopes 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 ( DependencyFactory, @@ -614,7 +612,6 @@ def test_lifespan_scoped_dependency_can_be_used_alongside_custom_lifespans( app = FastAPI(on_startup=[startup], on_shutdown=[shutdown]) - dependency_factory = DependencyFactory(dependency_style) create_endpoint_1_annotation( @@ -742,10 +739,7 @@ def test_endpoints_report_incorrect_dependency_scope_at_router_scope( ): dependency_factory = DependencyFactory(DependencyStyle.ASYNC_GENERATOR) - depends = Depends( - dependency_factory.get_dependency(), - dependency_scope="lifespan" - ) + depends = Depends(dependency_factory.get_dependency(), dependency_scope="lifespan") # We intentionally change the dependency scope here to bypass the # validation at the function level. @@ -757,7 +751,6 @@ def test_endpoints_report_incorrect_dependency_scope_at_router_scope( else: router = APIRouter(dependencies=[depends]) - with pytest.raises(InvalidDependencyScope): create_endpoint_0_annotations( router=router, @@ -903,15 +896,16 @@ def test_bad_lifespan_scoped_dependencies( assert exception_info.value.args == (1,) + def test_endpoint_dependant_backwards_compatibility(): dependency_factory = DependencyFactory(DependencyStyle.ASYNC_GENERATOR) def endpoint( dependency1: Annotated[int, Depends(dependency_factory.get_dependency())], - dependency2: Annotated[int, Depends( - dependency_factory.get_dependency(), - dependency_scope="lifespan" - )], + dependency2: Annotated[ + int, + Depends(dependency_factory.get_dependency(), dependency_scope="lifespan"), + ], ): pass # pragma: nocover @@ -922,6 +916,5 @@ def test_endpoint_dependant_backwards_compatibility(): ) assert dependant.dependencies == tuple( - dependant.lifespan_dependencies + - dependant.endpoint_dependencies - ) \ No newline at end of file + dependant.lifespan_dependencies + dependant.endpoint_dependencies + )