summaryrefslogtreecommitdiff
path: root/sphinx/config.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2018-09-22 20:05:31 +0900
committerGitHub <noreply@github.com>2018-09-22 20:05:31 +0900
commit5ffce30d7527166e444d79e10a88e795d6a0b9c0 (patch)
tree3da72e9b128132de76fe4a949ad99166161cb13f /sphinx/config.py
parent47661f844f8750d710663c86754cfe7f83a3b202 (diff)
parent46298f2a7b56145ae380d2ff18fab55df3c78a63 (diff)
downloadsphinx-git-5ffce30d7527166e444d79e10a88e795d6a0b9c0.tar.gz
Merge pull request #5413 from jdufresne/six-classtypes
Remove use of six.class_types
Diffstat (limited to 'sphinx/config.py')
-rw-r--r--sphinx/config.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/config.py b/sphinx/config.py
index f3d1f7b39..87d5313ae 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'
-UNSERIALIZABLE_TYPES = class_types + (types.ModuleType, types.FunctionType)
+UNSERIALIZABLE_TYPES = (type, types.ModuleType, types.FunctionType)
copyright_year_re = re.compile(r'^((\d{4}-)?)(\d{4})(?=[ ,])')
if PY3: