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 '3.0.x' into 3.x

Browse Source
This commit is contained in:
Takeshi KOMIYA 2020-04-05 23:57:05 +09:00
commit 4f33a1eb86
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sphinx/util/inspect.py
View File

@ -17,7 +17,7 @@ import typing
import warnings import warnings
from functools import partial, partialmethod from functools import partial, partialmethod
from inspect import ( # NOQA from inspect import ( # NOQA
Parameter, isclass, ismethod, ismethoddescriptor, isroutine, unwrap Parameter, isclass, ismethod, ismethoddescriptor, unwrap
) )
from io import StringIO from io import StringIO
from typing import Any, Callable, Mapping, List, Tuple from typing import Any, Callable, Mapping, List, Tuple

2
tests/test_autodoc.py
View File

@ -1422,7 +1422,7 @@ def test_wrappedfunction(app):
' :module: target.wrappedfunction', ' :module: target.wrappedfunction',
'', '',
' This function is slow.', ' This function is slow.',
' ', '',
] ]