IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1.x' into 4.x

Browse Source
This commit is contained in:
Takeshi KOMIYA 2021-07-20 00:41:01 +09:00
commit a4898f8f78
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/test_ext_autodoc.py
View File

@ -1398,16 +1398,9 @@ def test_slots(app):
def test_enum_class(app):
options = {"members": None}
actual = do_autodoc(app, 'class', 'target.enums.EnumCls', options)
if sys.version_info < (3, 10):
sig = '(value)'
else:
sig = ('(value, names=None, *, module=None, qualname=None, type=None, start=1, '
'boundary=None)')
assert list(actual) == [
'',
'.. py:class:: EnumCls%s' % sig,
'.. py:class:: EnumCls(value)',
' :module: target.enums',
'',
' this is enum class',

7
tests/test_util_inspect.py
View File

@ -215,11 +215,8 @@ def test_signature_annotations():
# optional union
sig = inspect.signature(f20)
if sys.version_info < (3, 7):
assert stringify_signature(sig) in ('() -> Optional[Union[int, str]]',
'() -> Optional[Union[str, int]]')
else:
assert stringify_signature(sig) == '() -> Optional[Union[int, str]]'
assert stringify_signature(sig) in ('() -> Optional[Union[int, str]]',
'() -> Optional[Union[str, int]]')
# Any
sig = inspect.signature(f14)

8
tests/test_util_typing.py
View File

@ -142,9 +142,9 @@ def test_restify_type_Literal():
@pytest.mark.skipif(sys.version_info < (3, 10), reason='python 3.10+ is required.')
def test_restify_type_union_operator():
assert restify(int | None) == "Optional[:class:`int`]" # type: ignore
assert restify(int | None) == ":class:`int` | :obj:`None`" # type: ignore
assert restify(int | str) == ":class:`int` | :class:`str`" # type: ignore
assert restify(int | str | None) == "Optional[:class:`int` | :class:`str`]" # type: ignore
assert restify(int | str | None) == ":class:`int` | :class:`str` | :obj:`None`" # type: ignore
def test_restify_broken_type_hints():
@ -253,9 +253,9 @@ def test_stringify_type_Literal():
@pytest.mark.skipif(sys.version_info < (3, 10), reason='python 3.10+ is required.')
def test_stringify_type_union_operator():
assert stringify(int | None) == "Optional[int]" # type: ignore
assert stringify(int | None) == "int | None" # type: ignore
assert stringify(int | str) == "int | str" # type: ignore
assert stringify(int | str | None) == "Optional[int | str]" # type: ignore
assert stringify(int | str | None) == "int | str | None" # type: ignore
def test_stringify_broken_type_hints():