From c46c61fa3230529d607cf7993388a11238db3827 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 11 Nov 2018 18:44:30 +0900 Subject: [PATCH] Fix type annotations for RoleFunction --- sphinx/domains/__init__.py | 4 ++-- sphinx/util/typing.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sphinx/domains/__init__.py b/sphinx/domains/__init__.py index fe2207d3c..070de1a5e 100644 --- a/sphinx/domains/__init__.py +++ b/sphinx/domains/__init__.py @@ -17,7 +17,7 @@ from sphinx.locale import _ if False: # For type annotation - from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type, Union # NOQA + from typing import Any, Callable, Dict, Iterable, List, Tuple, Type, Union # NOQA from docutils import nodes # NOQA from docutils.parsers.rst.states import Inliner # NOQA from sphinx.builders import Builder # NOQA @@ -212,7 +212,7 @@ class Domain: fullname = '%s:%s' % (self.name, name) def role_adapter(typ, rawtext, text, lineno, inliner, options={}, content=[]): - # type: (unicode, unicode, unicode, int, Inliner, Optional[Dict], Optional[List[unicode]]) -> Tuple[List[nodes.Node], List[nodes.Node]] # NOQA + # type: (unicode, unicode, unicode, int, Inliner, Dict, List[unicode]) -> Tuple[List[nodes.Node], List[nodes.Node]] # NOQA return self.roles[name](fullname, rawtext, text, lineno, inliner, options, content) self._role_cache[name] = role_adapter diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py index 609de302d..d31fa7c68 100644 --- a/sphinx/util/typing.py +++ b/sphinx/util/typing.py @@ -9,7 +9,7 @@ :license: BSD, see LICENSE for details. """ -from typing import Callable, Dict, List, Optional, Tuple +from typing import Callable, Dict, List, Tuple from docutils import nodes from docutils.parsers.rst.states import Inliner @@ -17,8 +17,7 @@ from six import text_type # common role functions -RoleFunction = Callable[[text_type, text_type, text_type, int, Inliner, - Optional[Dict], Optional[List[text_type]]], +RoleFunction = Callable[[text_type, text_type, text_type, int, Inliner, Dict, List[text_type]], Tuple[List[nodes.Node], List[nodes.Node]]] # title getter functions for enumerable nodes (see sphinx.domains.std)