diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-04-05 23:57:05 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-04-05 23:57:05 +0900 |
| commit | 4f33a1eb86611c64a4a496f73b6e318e21c7c6b6 (patch) | |
| tree | d10bd277819d96ffe9d73472da2598017ed9ca9f | |
| parent | 4c1b8b8db6fa25afcab1a6a3634776009cfafddf (diff) | |
| parent | becc798d36d747741760026f2a1b5f547d452aac (diff) | |
| download | sphinx-git-4f33a1eb86611c64a4a496f73b6e318e21c7c6b6.tar.gz | |
Merge branch '3.0.x' into 3.x
| -rw-r--r-- | sphinx/util/inspect.py | 2 | ||||
| -rw-r--r-- | tests/test_autodoc.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py index 53229d252..570ea9df6 100644 --- a/sphinx/util/inspect.py +++ b/sphinx/util/inspect.py @@ -17,7 +17,7 @@ import typing import warnings from functools import partial, partialmethod from inspect import ( # NOQA - Parameter, isclass, ismethod, ismethoddescriptor, isroutine, unwrap + Parameter, isclass, ismethod, ismethoddescriptor, unwrap ) from io import StringIO from typing import Any, Callable, Mapping, List, Tuple diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py index 11c3503be..dd474536d 100644 --- a/tests/test_autodoc.py +++ b/tests/test_autodoc.py @@ -1422,7 +1422,7 @@ def test_wrappedfunction(app): ' :module: target.wrappedfunction', '', ' This function is slow.', - ' ', + '', ] |