diff options
| author | cocodrips <cocodrips@gmail.com> | 2018-12-26 11:31:44 +0900 |
|---|---|---|
| committer | cocodrips <cocodrips@gmail.com> | 2018-12-26 11:31:50 +0900 |
| commit | 827059be93426b83afd2fc7d823c48681e5f913a (patch) | |
| tree | ec1893e5cf77acbb79d736ea3f841dc864781740 /sphinx/config.py | |
| parent | 448181d9f97611d352c0c8ec21e55e8242db9d60 (diff) | |
| parent | 99a7dca2160996e3189dfcc2176bbbbac531d5f3 (diff) | |
| download | sphinx-git-827059be93426b83afd2fc7d823c48681e5f913a.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 5842-apidoc-extensions
Diffstat (limited to 'sphinx/config.py')
| -rw-r--r-- | sphinx/config.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sphinx/config.py b/sphinx/config.py index 002b2a559..338de770c 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -16,8 +16,6 @@ from collections import OrderedDict from os import path, getenv from typing import Any, NamedTuple, Union -from six import text_type - from sphinx.deprecation import RemovedInSphinx30Warning, RemovedInSphinx40Warning from sphinx.errors import ConfigError, ExtensionError from sphinx.locale import _, __ @@ -41,7 +39,7 @@ copyright_year_re = re.compile(r'^((\d{4}-)?)(\d{4})(?=[ ,])') ConfigValue = NamedTuple('ConfigValue', [('name', str), ('value', Any), - ('rebuild', Union[bool, text_type])]) + ('rebuild', Union[bool, str])]) def is_serializable(obj): @@ -78,7 +76,7 @@ class ENUM: # RemovedInSphinx40Warning -string_classes = [text_type] # type: List +string_classes = [str] # type: List class Config: |