Add test for generic aliases and lenient_issubclass (#2392)

This commit is contained in:
Davis Kirkendall
2021-02-25 18:08:21 +01:00
committed by GitHub
parent eab9d05473
commit aa92db5e4f
4 changed files with 17 additions and 2 deletions
+1
View File
@@ -0,0 +1 @@
fix: allow `utils.lenient_issubclass` to handle `typing.GenericAlias` objects like `list[str]` in python >= 3.9.
+1
View File
@@ -221,6 +221,7 @@ __all__ = (
'CallableGenerator',
'ReprArgs',
'CallableGenerator',
'GenericAlias',
'get_args',
'get_origin',
'typing_base',
+7 -2
View File
@@ -24,7 +24,7 @@ from typing import (
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:
+8
View File
@@ -109,6 +109,14 @@ def test_lenient_issubclass():
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