Browse Source

🔥 Remove more unused references to Pydantic v1

pull/14609/head
Sebastián Ramírez 7 months ago
parent
commit
ec213fa26e
  1. 7
      fastapi/dependencies/utils.py
  2. 2
      fastapi/encoders.py
  3. 30
      fastapi/routing.py

7
fastapi/dependencies/utils.py

@ -48,7 +48,7 @@ from fastapi.concurrency import (
contextmanager_in_threadpool,
)
from fastapi.dependencies.models import Dependant
from fastapi.exceptions import DependencyScopeError, PydanticV1NotSupportedError
from fastapi.exceptions import DependencyScopeError
from fastapi.logger import logger
from fastapi.security.oauth2 import SecurityScopes
from fastapi.types import DependencyCacheKey
@ -318,11 +318,6 @@ def get_dependant(
)
continue
assert param_details.field is not None
if isinstance(param_details.field, may_v1.ModelField):
raise PydanticV1NotSupportedError(
"pydantic.v1 models are no longer supported by FastAPI."
f" Please update the param {param_name}: {param_details.type_annotation!r}."
)
if isinstance(param_details.field.field_info, params.Body):
dependant.body_params.append(param_details.field)
else:

2
fastapi/encoders.py

@ -234,8 +234,6 @@ def jsonable_encoder(
exclude_none=exclude_none,
exclude_defaults=exclude_defaults,
)
if "__root__" in obj_dict:
obj_dict = obj_dict["__root__"]
return jsonable_encoder(
obj_dict,
exclude_none=exclude_none,

30
fastapi/routing.py

@ -144,36 +144,6 @@ def websocket_session(
return app
def _prepare_response_content(
res: Any,
*,
exclude_unset: bool,
exclude_defaults: bool = False,
exclude_none: bool = False,
) -> Any:
if isinstance(res, list):
return [
_prepare_response_content(
item,
exclude_unset=exclude_unset,
exclude_defaults=exclude_defaults,
exclude_none=exclude_none,
)
for item in res
]
elif isinstance(res, dict):
return {
k: _prepare_response_content(
v,
exclude_unset=exclude_unset,
exclude_defaults=exclude_defaults,
exclude_none=exclude_none,
)
for k, v in res.items()
}
return res
def _merge_lifespan_context(
original_context: Lifespan[Any], nested_context: Lifespan[Any]
) -> Lifespan[Any]:

Loading…
Cancel
Save