From 064db83a6dcc9904452dd83e41fb9e6b314e53f7 Mon Sep 17 00:00:00 2001 From: jameschua Date: Sun, 25 Jun 2023 23:15:22 +0800 Subject: [PATCH] remove compat file --- strawberry/experimental/pydantic/v2_compat.py | 13 ------------- strawberry/experimental/pydantic2/error_type.py | 2 +- strawberry/experimental/pydantic2/fields.py | 14 +++++++------- strawberry/experimental/pydantic2/v2_compat.py | 1 - 4 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 strawberry/experimental/pydantic/v2_compat.py diff --git a/strawberry/experimental/pydantic/v2_compat.py b/strawberry/experimental/pydantic/v2_compat.py deleted file mode 100644 index f1b70b210c..0000000000 --- a/strawberry/experimental/pydantic/v2_compat.py +++ /dev/null @@ -1,13 +0,0 @@ -import pydantic - -if pydantic.VERSION[0] == "2": - - from pydantic._internal._utils import lenient_issubclass, smart_deepcopy - - def new_type_supertype(type_): - return type_.__supertype__ - -else: - from pydantic.utils import lenient_issubclass, smart_deepcopy - -__all__ = ["smart_deepcopy", "lenient_issubclass"] diff --git a/strawberry/experimental/pydantic2/error_type.py b/strawberry/experimental/pydantic2/error_type.py index 495d47df74..8ec9209efc 100644 --- a/strawberry/experimental/pydantic2/error_type.py +++ b/strawberry/experimental/pydantic2/error_type.py @@ -16,6 +16,7 @@ ) from pydantic import BaseModel +from pydantic._internal._utils import lenient_issubclass from strawberry.auto import StrawberryAuto from strawberry.experimental.pydantic2.utils import ( @@ -23,7 +24,6 @@ get_strawberry_type_from_model, normalize_type, ) -from strawberry.experimental.pydantic2.v2_compat import lenient_issubclass from strawberry.object_type import _process_type, _wrap_dataclass from strawberry.types.type_resolver import _get_fields from strawberry.utils.typing import get_list_annotation, is_list diff --git a/strawberry/experimental/pydantic2/fields.py b/strawberry/experimental/pydantic2/fields.py index fb86983d90..ba5a9f0d56 100644 --- a/strawberry/experimental/pydantic2/fields.py +++ b/strawberry/experimental/pydantic2/fields.py @@ -3,18 +3,14 @@ import pydantic from pydantic import BaseModel +from pydantic._internal._typing_extra import is_new_type +from pydantic._internal._utils import lenient_issubclass +from typing_extensions import get_args, get_origin from strawberry.experimental.pydantic2.exceptions import ( UnregisteredTypeException, UnsupportedTypeError, ) -from strawberry.experimental.pydantic2.v2_compat import ( - get_args, - get_origin, - is_new_type, - lenient_issubclass, - new_type_supertype, -) from strawberry.types.types import TypeDefinition try: @@ -39,6 +35,10 @@ } +def new_type_supertype(type_): + return type_.__supertype__ + + def get_basic_type(type_: Any) -> Type[Any]: # if lenient_issubclass(type_, pydantic.ConstrainedInt): # if lenient_issubclass(type_, pydantic.ConstrainedFloat): diff --git a/strawberry/experimental/pydantic2/v2_compat.py b/strawberry/experimental/pydantic2/v2_compat.py index f1b70b210c..4109331c9e 100644 --- a/strawberry/experimental/pydantic2/v2_compat.py +++ b/strawberry/experimental/pydantic2/v2_compat.py @@ -1,7 +1,6 @@ import pydantic if pydantic.VERSION[0] == "2": - from pydantic._internal._utils import lenient_issubclass, smart_deepcopy def new_type_supertype(type_):