Fix mypy violations

sphinx/ext/autodoc/__init__.py

@@ -19,7 +19,6 @@ import warnings
 
 from six import PY2, iterkeys, iteritems, itervalues, text_type, class_types, string_types
 
-from docutils.parsers.rst import Directive
 from docutils.statemachine import ViewList
 
 import sphinx
@@ -41,7 +40,10 @@ if False:
     # For type annotation
     from types import ModuleType  # NOQA
     from typing import Any, Callable, Dict, Iterator, List, Sequence, Set, Tuple, Type, Union  # NOQA
+    from docutils import nodes  # NOQA
+    from docutils.utils import Reporter  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.ext.autodoc.directive import DocumenterBridge  # NOQA
 
 logger = logging.getLogger(__name__)
 
@@ -271,7 +273,7 @@ class Documenter(object):
         raise NotImplementedError('must be implemented in subclasses')
 
     def __init__(self, directive, name, indent=u''):
-        # type: (Directive, unicode, unicode) -> None
+        # type: (DocumenterBridge, unicode, unicode) -> None
         self.directive = directive
         self.env = directive.env
         self.options = directive.genopt

sphinx/ext/autosummary/__init__.py

@@ -72,7 +72,7 @@ from sphinx import addnodes
 from sphinx.environment.adapters.toctree import TocTree
 from sphinx.util import import_object, rst, logging
 from sphinx.pycode import ModuleAnalyzer, PycodeError
-from sphinx.ext.autodoc.directive import Options
+from sphinx.ext.autodoc.directive import DocumenterBridge, Options
 from sphinx.ext.autodoc.importer import import_module
 
 if False:
@@ -153,9 +153,9 @@ def autosummary_table_visit_html(self, node):
 
 # -- autodoc integration -------------------------------------------------------
 
-class FakeDirective(object):
+class FakeDirective(DocumenterBridge):
-    env = {}  # type: Dict
+    def __init__(self):
-    genopt = Options()
+        super(FakeDirective, self).__init__({}, None, Options(), 0)  # type: ignore
 
 
 def get_documenter(obj, parent):

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, Iterator, List, Tuple  # NOQA
+    from typing import Any, Callable, Dict, Generator, Iterator, List, Tuple  # NOQA
     from docutils import nodes  # NOQA
     from docutils.statemachine import State  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
@@ -221,7 +221,7 @@ def directive_helper(obj, has_content=None, argument_spec=None, option_spec=None
 
 @contextmanager
 def switch_source_input(state, content):
-    # type: (State, ViewList) -> None
+    # type: (State, ViewList) -> Generator
     """Switch current source input of state temporarily."""
     try:
         # remember the original ``get_source_and_line()`` method