diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-11-12 02:50:43 +0900 |
---|---|---|
committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-11-12 02:50:43 +0900 |
commit | 279e547860ea68e3c357f55e608afec682a1f961 (patch) | |
tree | dc08e85ab0210538e30b5b801bf9d80ab49bfb3f /sphinx/util/inspect.py | |
parent | 859b5fcea71f8d4f46e0ef3726e68df54bfbc3b7 (diff) | |
parent | 64fb1e56242d93ee0e8c317ab9e7643242b99658 (diff) | |
download | sphinx-git-279e547860ea68e3c357f55e608afec682a1f961.tar.gz |
Merge branch '3.x'
Diffstat (limited to 'sphinx/util/inspect.py')
-rw-r--r-- | sphinx/util/inspect.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py index b8a149d05..d1e9c4435 100644 --- a/sphinx/util/inspect.py +++ b/sphinx/util/inspect.py @@ -18,12 +18,9 @@ import types import typing import warnings from functools import partial, partialmethod -from inspect import ( # NOQA - Parameter, isclass, ismethod, ismethoddescriptor, ismodule -) +from inspect import Parameter, isclass, ismethod, ismethoddescriptor, ismodule # NOQA from io import StringIO -from typing import Any, Callable, Dict -from typing import cast +from typing import Any, Callable, Dict, cast from sphinx.deprecation import RemovedInSphinx50Warning from sphinx.pycode.ast import ast # for py36-37 @@ -33,11 +30,7 @@ from sphinx.util.typing import ForwardRef from sphinx.util.typing import stringify as stringify_annotation if sys.version_info > (3, 7): - from types import ( - ClassMethodDescriptorType, - MethodDescriptorType, - WrapperDescriptorType - ) + from types import ClassMethodDescriptorType, MethodDescriptorType, WrapperDescriptorType else: ClassMethodDescriptorType = type(object.__init__) MethodDescriptorType = type(str.join) |