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/rest/client/models.py | |
| 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/rest/client/models.py')
| -rw-r--r-- | synapse/rest/client/models.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/rest/client/models.py b/synapse/rest/client/models.py index 3d7940b0fc..880f79473c 100644 --- a/synapse/rest/client/models.py +++ b/synapse/rest/client/models.py @@ -13,7 +13,12 @@ # limitations under the License. from typing import TYPE_CHECKING, Dict, Optional -from pydantic import Extra, StrictInt, StrictStr, constr, validator +from synapse._pydantic_compat import HAS_PYDANTIC_V2 + +if TYPE_CHECKING or HAS_PYDANTIC_V2: + from pydantic.v1 import Extra, StrictInt, StrictStr, constr, validator +else: + from pydantic import Extra, StrictInt, StrictStr, constr, validator from synapse.rest.models import RequestBodyModel from synapse.util.threepids import validate_email |