ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2024-11-24 00:55:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

🐛 修复依赖注入对 Literal 检查报错 (#2433)

Browse Source
This commit is contained in:
Ju4tCode 2023-10-27 23:09:32 +08:00 committed by GitHub
parent 613fde4639
commit 9305fe7875
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nonebot/utils.py
View File

@ -31,7 +31,7 @@ from typing import (
overload, overload,
) )
from pydantic.typing import is_union, is_none_type from pydantic.typing import is_union, is_none_type, is_literal_type, all_literal_values
from nonebot.log import logger from nonebot.log import logger
@ -75,9 +75,18 @@ def generic_check_issubclass(
is_none_type(type_) or generic_check_issubclass(type_, class_or_tuple) is_none_type(type_) or generic_check_issubclass(type_, class_or_tuple)
for type_ in get_args(cls) for type_ in get_args(cls)
) )
elif is_literal_type(cls):
return all(
is_none_type(value) or isinstance(value, class_or_tuple)
for value in all_literal_values(cls)
)
# ensure generic List, Dict can be checked # ensure generic List, Dict can be checked
elif origin: elif origin:
return issubclass(origin, class_or_tuple) # avoid class check error (typing.Final, typing.ClassVar, etc...)
try:
return issubclass(origin, class_or_tuple)
except TypeError:
return False
elif isinstance(cls, TypeVar): elif isinstance(cls, TypeVar):
if cls.__constraints__: if cls.__constraints__:
return all( return all(

5
tests/test_utils.py
View File

@ -1,5 +1,5 @@
import json import json
from typing import Dict, List, Union, TypeVar from typing import Dict, List, Union, Literal, TypeVar, ClassVar
from utils import FakeMessage, FakeMessageSegment from utils import FakeMessage, FakeMessageSegment
from nonebot.utils import ( from nonebot.utils import (
@ -24,8 +24,11 @@ def test_generic_check_issubclass():
assert generic_check_issubclass(int, (int, float)) assert generic_check_issubclass(int, (int, float))
assert not generic_check_issubclass(str, (int, float)) assert not generic_check_issubclass(str, (int, float))
assert generic_check_issubclass(Union[int, float, None], (int, float)) assert generic_check_issubclass(Union[int, float, None], (int, float))
assert generic_check_issubclass(Literal[1, 2, 3], int)
assert not generic_check_issubclass(Literal[1, 2, "3"], int)
assert generic_check_issubclass(List[int], list) assert generic_check_issubclass(List[int], list)
assert generic_check_issubclass(Dict[str, int], dict) assert generic_check_issubclass(Dict[str, int], dict)
assert not generic_check_issubclass(ClassVar[int], int)
assert generic_check_issubclass(TypeVar("T", int, float), (int, float)) assert generic_check_issubclass(TypeVar("T", int, float), (int, float))
assert generic_check_issubclass(TypeVar("T", bound=int), (int, float)) assert generic_check_issubclass(TypeVar("T", bound=int), (int, float))