diff --git a/changes/2399-daviskirk.md b/changes/2399-daviskirk.md new file mode 100644 index 0000000000..1191a5bed3 --- /dev/null +++ b/changes/2399-daviskirk.md @@ -0,0 +1 @@ +fix: allow `utils.lenient_issubclass` to handle `typing.GenericAlias` objects like `list[str]` in python >= 3.9. diff --git a/pydantic/typing.py b/pydantic/typing.py index ff0cb7ee26..66e332aa54 100644 --- a/pydantic/typing.py +++ b/pydantic/typing.py @@ -221,6 +221,7 @@ def get_args(tp: Type[Any]) -> Tuple[Any, ...]: 'CallableGenerator', 'ReprArgs', 'CallableGenerator', + 'GenericAlias', 'get_args', 'get_origin', 'typing_base', diff --git a/pydantic/utils.py b/pydantic/utils.py index ab2f3bcdfc..8a8351c6e5 100644 --- a/pydantic/utils.py +++ b/pydantic/utils.py @@ -24,7 +24,7 @@ no_type_check, ) -from .typing import NoneType, display_as_type +from .typing import GenericAlias, NoneType, display_as_type from .version import version_info if TYPE_CHECKING: @@ -149,7 +149,12 @@ def validate_field_name(bases: List[Type['BaseModel']], field_name: str) -> None def lenient_issubclass(cls: Any, class_or_tuple: Union[Type[Any], Tuple[Type[Any], ...]]) -> bool: - return isinstance(cls, type) and issubclass(cls, class_or_tuple) + try: + return isinstance(cls, type) and issubclass(cls, class_or_tuple) + except TypeError: + if isinstance(cls, GenericAlias): + return False + raise # pragma: no cover def in_ipython() -> bool: diff --git a/tests/test_utils.py b/tests/test_utils.py index dd45ca1483..52e4b81af8 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -109,6 +109,14 @@ class A(str): assert lenient_issubclass(A, str) is True +@pytest.mark.skipif(sys.version_info < (3, 9), reason='generic aliases are not available in python < 3.9') +def test_lenient_issubclass_with_generic_aliases(): + from collections.abc import Mapping + + # should not raise an error here: + assert lenient_issubclass(list[str], Mapping) is False + + def test_lenient_issubclass_is_lenient(): assert lenient_issubclass('a', 'a') is False