summaryrefslogtreecommitdiff
path: root/sphinx/util/docutils.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2017-12-20 00:09:49 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2017-12-20 00:09:49 +0900
commit25b96b833d79936734df5f23ee055b59969cd6a2 (patch)
treea1f7aeedb51e9141bb87ff744edffe69ff8694a9 /sphinx/util/docutils.py
parent04995b703fbf43345ee805a140a64f6bf78b0ff9 (diff)
downloadsphinx-git-25b96b833d79936734df5f23ee055b59969cd6a2.tar.gz
Revert the changes of directive_helper
Diffstat (limited to 'sphinx/util/docutils.py')
-rw-r--r--sphinx/util/docutils.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/sphinx/util/docutils.py b/sphinx/util/docutils.py
index 5377e493c..3cd257cba 100644
--- a/sphinx/util/docutils.py
+++ b/sphinx/util/docutils.py
@@ -31,7 +31,7 @@ report_re = re.compile('^(.+?:(?:\\d+)?): \\((DEBUG|INFO|WARNING|ERROR|SEVERE)/(
if False:
# For type annotation
- from typing import Any, Callable, Dict, Generator, Iterator, List, Tuple # NOQA
+ from typing import Any, Callable, Generator, Iterator, List, Tuple # NOQA
from docutils import nodes # NOQA
from docutils.statemachine import State # NOQA
from sphinx.environment import BuildEnvironment # NOQA
@@ -205,12 +205,12 @@ def is_html5_writer_available():
return __version_info__ > (0, 13, 0)
-def directive_helper(obj, has_content=None, argument_spec=None, option_spec=None, **options):
- # type: (Any, bool, Tuple[int, int, bool], Dict, Any) -> Any
+def directive_helper(obj, has_content=None, argument_spec=None, **option_spec):
+ # type: (Any, bool, Tuple[int, int, bool], Any) -> Any
if isinstance(obj, (types.FunctionType, types.MethodType)):
obj.content = has_content # type: ignore
obj.arguments = argument_spec or (0, 0, False) # type: ignore
- obj.options = option_spec or options # type: ignore
+ obj.options = option_spec # type: ignore
return convert_directive_function(obj)
else:
if has_content or argument_spec or option_spec: