Resolved conflicts.

docs_src/dependencies/tutorial013c_an_py39.py

@@ -32,9 +32,7 @@ async def get_configuration() -> dict:
     }
 
 
-GlobalConfiguration = Annotated[
-    dict, Depends(get_configuration, scope="lifespan")
-]
+GlobalConfiguration = Annotated[dict, Depends(get_configuration, scope="lifespan")]
 
 
 async def get_database_connection(configuration: GlobalConfiguration):

fastapi/applications.py

@@ -36,9 +36,8 @@ from fastapi.openapi.utils import get_openapi
 from fastapi.params import Depends
 from fastapi.routing import merge_lifespan_context
 from fastapi.types import DecoratedCallable, IncEx
-from fastapi.utils import generate_unique_id, call_asynchronously
+from fastapi.utils import call_asynchronously, generate_unique_id
 from starlette.applications import Starlette
-from starlette.concurrency import run_in_threadpool
 from starlette.datastructures import State
 from starlette.exceptions import HTTPException
 from starlette.middleware import Middleware

fastapi/dependencies/models.py

@@ -2,7 +2,7 @@ import inspect
 import sys
 from dataclasses import dataclass, field
 from functools import cached_property
-from typing import Any, Callable, List, Optional, Sequence, Union, Tuple, cast
+from typing import Any, Callable, List, Optional, Sequence, Tuple, Union, cast
 
 from fastapi._compat import ModelField
 from fastapi.security.base import SecurityBase

fastapi/utils.py

@@ -19,8 +19,6 @@ from typing import (
 )
 from weakref import WeakKeyDictionary
 
-from starlette.concurrency import run_in_threadpool
-
 import fastapi
 from fastapi._compat import (
     PYDANTIC_V2,
@@ -37,7 +35,8 @@ from fastapi._compat import (
 from fastapi.datastructures import DefaultPlaceholder, DefaultType
 from pydantic import BaseModel
 from pydantic.fields import FieldInfo
-from typing_extensions import Literal, TypeIs, ParamSpec
+from starlette.concurrency import run_in_threadpool
+from typing_extensions import Literal, ParamSpec, TypeIs
 
 if TYPE_CHECKING:  # pragma: nocover
     from .routing import APIRoute

tests/test_params_repr.py

@@ -1,6 +1,5 @@
 from typing import Any, List
 
-import pytest
 from dirty_equals import IsOneOf
 from fastapi.params import Body, Cookie, Header, Param, Path, Query