Browse Source

Merge remote-tracking branch 'origin/feat/ty' into feat/ty

pull/15091/head
svlandeg 4 months ago
parent
commit
8dc79b92e0
  1. 4
      fastapi/encoders.py
  2. 2
      fastapi/openapi/utils.py

4
fastapi/encoders.py

@ -22,7 +22,7 @@ from annotated_doc import Doc
from fastapi.exceptions import PydanticV1NotSupportedError from fastapi.exceptions import PydanticV1NotSupportedError
from fastapi.types import IncEx from fastapi.types import IncEx
from pydantic import BaseModel from pydantic import BaseModel
from pydantic.color import Color # ty: ignore[deprecated] from pydantic.color import Color # ty: ignore[deprecated]
from pydantic.networks import AnyUrl, NameEmail from pydantic.networks import AnyUrl, NameEmail
from pydantic.types import SecretBytes, SecretStr from pydantic.types import SecretBytes, SecretStr
from pydantic_core import PydanticUndefinedType from pydantic_core import PydanticUndefinedType
@ -67,7 +67,7 @@ def decimal_encoder(dec_value: Decimal) -> int | float:
ENCODERS_BY_TYPE: dict[type[Any], Callable[[Any], Any]] = { ENCODERS_BY_TYPE: dict[type[Any], Callable[[Any], Any]] = {
bytes: lambda o: o.decode(), bytes: lambda o: o.decode(),
Color: str, # ty: ignore[deprecated] Color: str, # ty: ignore[deprecated]
datetime.date: isoformat, datetime.date: isoformat,
datetime.datetime: isoformat, datetime.datetime: isoformat,
datetime.time: isoformat, datetime.time: isoformat,

2
fastapi/openapi/utils.py

@ -247,7 +247,7 @@ def get_openapi_operation_metadata(
if operation_id in operation_ids: if operation_id in operation_ids:
message = ( message = (
f"Duplicate Operation ID {operation_id} for function " f"Duplicate Operation ID {operation_id} for function "
+ f"{route.endpoint.__name__}" # ty: ignore[unresolved-attribute] + f"{route.endpoint.__name__}" # ty: ignore[unresolved-attribute]
) )
file_name = getattr(route.endpoint, "__globals__", {}).get("__file__") file_name = getattr(route.endpoint, "__globals__", {}).get("__file__")
if file_name: if file_name:

Loading…
Cancel
Save