Merge pull request #6972 from tk0miya/refactor_type_annotation2

mypy: Enable disallow_incomplete_defs flag for type checking

5 files changed, 12 insertions, 10 deletions

diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index 50816bcf6..ad8bf7a68 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -13,8 +13,8 @@ import os
 import posixpath
 import sys
 import warnings
+from typing import Any, Iterable, Tuple
 from typing import cast
-from typing import Iterable, Tuple
 
 from docutils import nodes
 from docutils.nodes import Element, Node, Text
@@ -73,7 +73,7 @@ class HTMLTranslator(SphinxTranslator, BaseTranslator):
 
     builder = None  # type: StandaloneHTMLBuilder
 
-    def __init__(self, *args) -> None:
+    def __init__(self, *args: Any) -> None:
         if isinstance(args[0], nodes.document) and isinstance(args[1], Builder):
             document, builder = args
         else:
diff --git a/sphinx/writers/html5.py b/sphinx/writers/html5.py
index 8eefab141..7c570d9d6 100644
--- a/sphinx/writers/html5.py
+++ b/sphinx/writers/html5.py
@@ -12,8 +12,8 @@ import os
 import posixpath
 import sys
 import warnings
+from typing import Any, Iterable, Tuple
 from typing import cast
-from typing import Iterable, Tuple
 
 from docutils import nodes
 from docutils.nodes import Element, Node, Text
@@ -45,7 +45,7 @@ class HTML5Translator(SphinxTranslator, BaseTranslator):
 
     builder = None  # type: StandaloneHTMLBuilder
 
-    def __init__(self, *args) -> None:
+    def __init__(self, *args: Any) -> None:
         if isinstance(args[0], nodes.document) and isinstance(args[1], Builder):
             document, builder = args
         else:
diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py
index c9ae41609..cf507f0c5 100644
--- a/sphinx/writers/manpage.py
+++ b/sphinx/writers/manpage.py
@@ -60,7 +60,7 @@ class NestedInlineTransform:
     def __init__(self, document: nodes.document) -> None:
         self.document = document
 
-    def apply(self, **kwargs) -> None:
+    def apply(self, **kwargs: Any) -> None:
         matcher = NodeMatcher(nodes.literal, nodes.emphasis, nodes.strong)
         for node in self.document.traverse(matcher):  # type: TextElement
             if any(matcher(subnode) for subnode in node):
@@ -81,7 +81,7 @@ class ManualPageTranslator(SphinxTranslator, BaseTranslator):
 
     _docinfo = {}  # type: Dict[str, Any]
 
-    def __init__(self, *args) -> None:
+    def __init__(self, *args: Any) -> None:
         if isinstance(args[0], nodes.document) and isinstance(args[1], Builder):
             document, builder = args
         else:
diff --git a/sphinx/writers/text.py b/sphinx/writers/text.py
index a71aefa80..b5246cab8 100644
--- a/sphinx/writers/text.py
+++ b/sphinx/writers/text.py
@@ -13,7 +13,7 @@ import re
 import textwrap
 import warnings
 from itertools import groupby, chain
-from typing import Callable, Dict, List, Iterable, Optional, Set, Tuple, Union
+from typing import Any, Callable, Dict, List, Iterable, Optional, Set, Tuple, Union
 from typing import cast
 
 from docutils import nodes, writers
@@ -362,7 +362,7 @@ MAXWIDTH = 70
 STDINDENT = 3
 
 
-def my_wrap(text: str, width: int = MAXWIDTH, **kwargs) -> List[str]:
+def my_wrap(text: str, width: int = MAXWIDTH, **kwargs: Any) -> List[str]:
     w = TextWrapper(width=width, **kwargs)
     return w.wrap(text)
 
@@ -1182,6 +1182,6 @@ class TextTranslator(SphinxTranslator):
         warnings.warn('TextTranslator._make_depart_admonition() is deprecated.',
                       RemovedInSphinx30Warning)
 
-        def depart_admonition(self, node: Element) -> None:
+        def depart_admonition(self: "TextTranslator", node: Element) -> None:
             self.end_state(first=admonitionlabels[name] + ': ')
         return depart_admonition
diff --git a/sphinx/writers/xml.py b/sphinx/writers/xml.py
index 64da854e5..c75f64e25 100644
--- a/sphinx/writers/xml.py
+++ b/sphinx/writers/xml.py
@@ -8,6 +8,8 @@
     :license: BSD, see LICENSE for details.
 """
 
+from typing import Any
+
 from docutils.writers.docutils_xml import Writer as BaseXMLWriter
 
 from sphinx.builders import Builder
@@ -19,7 +21,7 @@ class XMLWriter(BaseXMLWriter):
         self.builder = builder
         self.translator_class = self.builder.get_translator_class()
 
-    def translate(self, *args, **kwargs) -> None:
+    def translate(self, *args: Any, **kwargs: Any) -> None:
         self.document.settings.newlines = \
             self.document.settings.indents = \
             self.builder.env.config.xml_pretty