diff options
| author | Maxwell G <maxwell@gtmx.me> | 2023-09-25 10:19:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-25 15:19:08 +0000 |
| commit | 12611bfcddfe87e3bad90ef96a648acc2f1cebf3 (patch) | |
| tree | 9d67371d56f1904f3098e9bf7668db71a8b631cc /synapse/http | |
| parent | Bump cryptography from 41.0.3 to 41.0.4 (#16362) (diff) | |
| download | synapse-12611bfcddfe87e3bad90ef96a648acc2f1cebf3.tar.xz | |
Add support for pydantic v2 via pydantic.v1 compat module (#16332)
While maintaining support with pydantic v1.
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/servlet.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/synapse/http/servlet.py b/synapse/http/servlet.py index 5d79d31579..d9d5655c95 100644 --- a/synapse/http/servlet.py +++ b/synapse/http/servlet.py @@ -28,8 +28,15 @@ from typing import ( overload, ) -from pydantic import BaseModel, MissingError, PydanticValueError, ValidationError -from pydantic.error_wrappers import ErrorWrapper +from synapse._pydantic_compat import HAS_PYDANTIC_V2 + +if TYPE_CHECKING or HAS_PYDANTIC_V2: + from pydantic.v1 import BaseModel, MissingError, PydanticValueError, ValidationError + from pydantic.v1.error_wrappers import ErrorWrapper +else: + from pydantic import BaseModel, MissingError, PydanticValueError, ValidationError + from pydantic.error_wrappers import ErrorWrapper + from typing_extensions import Literal from twisted.web.server import Request |