diff options
| -rw-r--r-- | sphinx/config.py | 4 | ||||
| -rw-r--r-- | sphinx/ext/autodoc/__init__.py | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sphinx/config.py b/sphinx/config.py index 039bf7b6a..a8a21a825 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -18,7 +18,7 @@ from os import path, getenv from typing import Any, NamedTuple, Union from six import ( - PY2, PY3, iteritems, string_types, binary_type, text_type, integer_types, class_types + PY2, PY3, iteritems, string_types, binary_type, text_type, integer_types ) from sphinx.deprecation import RemovedInSphinx30Warning @@ -38,7 +38,7 @@ if False: logger = logging.getLogger(__name__) CONFIG_FILENAME = 'conf.py' -UNSERIALIZEABLE_TYPES = class_types + (types.ModuleType, types.FunctionType) +UNSERIALIZEABLE_TYPES = (type, types.ModuleType, types.FunctionType) copyright_year_re = re.compile(r'^((\d{4}-)?)(\d{4})(?=[ ,])') if PY3: diff --git a/sphinx/ext/autodoc/__init__.py b/sphinx/ext/autodoc/__init__.py index 4129e17c6..0385a9bfc 100644 --- a/sphinx/ext/autodoc/__init__.py +++ b/sphinx/ext/autodoc/__init__.py @@ -17,7 +17,7 @@ import sys from typing import Any from docutils.statemachine import ViewList -from six import iteritems, itervalues, text_type, class_types, string_types +from six import iteritems, itervalues, text_type, string_types import sphinx from sphinx.ext.autodoc.importer import mock, import_object, get_object_members @@ -1053,7 +1053,7 @@ class ClassDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter): # type: @classmethod def can_document_member(cls, member, membername, isattr, parent): # type: (Any, unicode, bool, Any) -> bool - return isinstance(member, class_types) + return isinstance(member, type) def import_object(self): # type: () -> Any @@ -1205,8 +1205,7 @@ class ExceptionDocumenter(ClassDocumenter): @classmethod def can_document_member(cls, member, membername, isattr, parent): # type: (Any, unicode, bool, Any) -> bool - return isinstance(member, class_types) and \ - issubclass(member, BaseException) # type: ignore + return isinstance(member, type) and issubclass(member, BaseException) class DataDocumenter(ModuleLevelDocumenter): @@ -1337,7 +1336,7 @@ class AttributeDocumenter(DocstringStripSignatureMixin, ClassLevelDocumenter): # exported anywhere by Python return isdatadesc or (not isinstance(parent, ModuleDocumenter) and not inspect.isroutine(member) and - not isinstance(member, class_types)) + not isinstance(member, type)) def document_members(self, all_members=False): # type: (bool) -> None |