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/util/typing.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/util/typing.py')
| -rw-r--r-- | sphinx/util/typing.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py index cf6c49daf..ecfd61f01 100644 --- a/sphinx/util/typing.py +++ b/sphinx/util/typing.py @@ -12,7 +12,6 @@ from typing import Any, Callable, Dict, List, Tuple, Union from docutils import nodes from docutils.parsers.rst.states import Inliner -from six import text_type # An entry of Directive.option_spec @@ -22,11 +21,11 @@ DirectiveOption = Callable[[str], Any] TextlikeNode = Union[nodes.Text, nodes.TextElement] # common role functions -RoleFunction = Callable[[text_type, text_type, text_type, int, Inliner, Dict, List[text_type]], +RoleFunction = Callable[[str, str, str, int, Inliner, Dict, List[str]], Tuple[List[nodes.Node], List[nodes.system_message]]] # title getter functions for enumerable nodes (see sphinx.domains.std) -TitleGetter = Callable[[nodes.Node], text_type] +TitleGetter = Callable[[nodes.Node], str] # inventory data on memory Inventory = Dict[str, Dict[str, Tuple[str, str, str, str]]] |