Merge branch '2.0'

1 files changed, 6 insertions, 9 deletions

diff --git a/sphinx/util/compat.py b/sphinx/util/compat.py
index 805c17e5d..340dd77fa 100644
--- a/sphinx/util/compat.py
+++ b/sphinx/util/compat.py
@@ -10,22 +10,21 @@
 
 import sys
 import warnings
+from typing import Any, Dict
 
 from docutils.utils import get_source_line
 
 from sphinx import addnodes
+from sphinx.config import Config
 from sphinx.deprecation import RemovedInSphinx40Warning
 from sphinx.transforms import SphinxTransform
 
 if False:
     # For type annotation
-    from typing import Any, Dict  # NOQA
-    from sphinx.application import Sphinx  # NOQA
-    from sphinx.config import Config  # NOQA
+    from sphinx.application import Sphinx
 
 
-def register_application_for_autosummary(app):
-    # type: (Sphinx) -> None
+def register_application_for_autosummary(app: "Sphinx") -> None:
     """Register application object to autosummary module.
 
     Since Sphinx-1.7, documenters and attrgetters are registered into
@@ -42,8 +41,7 @@ class IndexEntriesMigrator(SphinxTransform):
     """Migrating indexentries from old style (4columns) to new style (5columns)."""
     default_priority = 700
 
-    def apply(self, **kwargs):
-        # type: (Any) -> None
+    def apply(self, **kwargs) -> None:
         for node in self.document.traverse(addnodes.index):
             for i, entries in enumerate(node['entries']):
                 if len(entries) == 4:
@@ -53,8 +51,7 @@ class IndexEntriesMigrator(SphinxTransform):
                     node['entries'][i] = entries + (None,)
 
 
-def setup(app):
-    # type: (Sphinx) -> Dict[str, Any]
+def setup(app: "Sphinx") -> Dict[str, Any]:
     app.add_transform(IndexEntriesMigrator)
     app.connect('builder-inited', register_application_for_autosummary)