Merge branch '1.7'

1 files changed, 3 insertions, 3 deletions

diff --git a/sphinx/io.py b/sphinx/io.py
index b7b70ef9b..826da1812 100644
--- a/sphinx/io.py
+++ b/sphinx/io.py
@@ -10,7 +10,6 @@
 """
 import codecs
 import re
-from typing import TYPE_CHECKING
 
 from docutils.core import Publisher
 from docutils.io import FileInput, NullOutput
@@ -35,7 +34,8 @@ from sphinx.transforms.i18n import (
 from sphinx.util import logging
 from sphinx.util.docutils import LoggingReporter
 
-if TYPE_CHECKING:
+if False:
+    # For type annotation
     from typing import Any, Dict, List, Tuple, Union  # NOQA
     from docutils import nodes  # NOQA
     from docutils.io import Input  # NOQA
@@ -306,7 +306,7 @@ def read_doc(app, env, filename):
                     source_class=SphinxDummySourceClass,
                     destination=NullOutput())
     pub.set_components(None, 'restructuredtext', None)
-    pub.process_programmatic_settings(None, env.settings, None)  # type: ignore
+    pub.process_programmatic_settings(None, env.settings, None)
     pub.set_source(source, filename)
     pub.publish()
     return pub.document