Add sphinx.util.typing:unicode to help mypy-3 migration

sphinx/addnodes.py

@@ -18,6 +18,7 @@ from sphinx.deprecation import RemovedInSphinx30Warning
 if False:
     # For type annotation
     from typing import List, Sequence  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class translatable:

sphinx/application.py

@@ -60,7 +60,7 @@ if False:
     from sphinx.extension import Extension  # NOQA
     from sphinx.roles import XRefRole  # NOQA
     from sphinx.theming import Theme  # NOQA
-    from sphinx.util.typing import RoleFunction, TitleGetter  # NOQA
+    from sphinx.util.typing import RoleFunction, TitleGetter, unicode  # NOQA
 
 builtin_extensions = (
     'sphinx.builders.applehelp',

sphinx/builders/__init__.py

@@ -47,6 +47,7 @@ if False:
     from sphinx.environment import BuildEnvironment  # NOQA
     from sphinx.util.i18n import CatalogInfo  # NOQA
     from sphinx.util.tags import Tags  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/builders/_epub_base.py

@@ -39,6 +39,7 @@ if False:
     # For type annotation
     from typing import Any, Dict, List, Tuple  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/builders/applehelp.py

@@ -31,6 +31,7 @@ if False:
     # For type annotation
     from typing import Any, Dict  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/builders/changes.py

@@ -27,6 +27,7 @@ if False:
     # For type annotation
     from typing import Any, Dict, List, Tuple  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/builders/devhelp.py

@@ -36,6 +36,7 @@ if False:
     # For type annotation
     from typing import Dict, List  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/builders/dummy.py

@@ -18,6 +18,7 @@ if False:
     from typing import Any, Dict, Set  # NOQA
     from docutils import nodes  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class DummyBuilder(Builder):

sphinx/builders/epub3.py

@@ -28,6 +28,7 @@ if False:
     from docutils import nodes  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.config import Config  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/builders/gettext.py

@@ -35,8 +35,9 @@ if False:
     # For type annotation
     from typing import Any, DefaultDict, Dict, Iterable, List, Set, Tuple  # NOQA
     from docutils import nodes  # NOQA
-    from sphinx.util.i18n import CatalogInfo  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.i18n import CatalogInfo  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/builders/html.py

@@ -60,6 +60,7 @@ if False:
     from sphinx.config import Config  # NOQA
     from sphinx.domains import Domain, Index, IndexEntry  # NOQA
     from sphinx.util.tags import Tags  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 # Experimental HTML5 Writer
 if is_html5_writer_available():
@@ -675,7 +676,7 @@ class StandaloneHTMLBuilder(Builder):
         doctree.settings = self.docsettings
 
         self.secnumbers = self.env.toc_secnumbers.get(docname, {})
-        self.fignumbers = self.env.toc_fignumbers.get(docname, {})  # type: Dict[unicode, Dict[unicode, Tuple[int, ...]]]  # NOQA
+        self.fignumbers = self.env.toc_fignumbers.get(docname, {})
         self.imgpath = relative_uri(self.get_target_uri(docname), '_images')
         self.dlpath = relative_uri(self.get_target_uri(docname), '_downloads')  # type: unicode
         self.current_docname = docname

sphinx/builders/htmlhelp.py

@@ -29,6 +29,7 @@ if False:
     # For type annotation
     from typing import Any, Dict, IO, List, Tuple  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/builders/latex/__init__.py

@@ -45,6 +45,7 @@ if False:
     from typing import Any, Dict, Iterable, List, Tuple, Union  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.config import Config  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 XINDY_LANG_OPTIONS = {

sphinx/builders/latex/transforms.py

@@ -21,6 +21,7 @@ from sphinx.util.nodes import NodeMatcher
 if False:
     # For type annotation
     from typing import Any, Dict, List, Set, Tuple, Union  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 URI_SCHEMES = ('mailto:', 'http:', 'https:', 'ftp:')
 

sphinx/builders/linkcheck.py

@@ -33,6 +33,7 @@ if False:
     from typing import Any, Dict, List, Set, Tuple, Union  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.util.requests.requests import Response  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/builders/manpage.py

@@ -28,6 +28,7 @@ if False:
     # For type annotation
     from typing import Any, Dict, List, Set, Union  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/builders/qthelp.py

@@ -31,6 +31,7 @@ if False:
     # For type annotation
     from typing import Any, Dict, List, Tuple  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/builders/texinfo.py

@@ -35,6 +35,7 @@ if False:
     # For type annotation
     from sphinx.application import Sphinx  # NOQA
     from typing import Any, Dict, Iterable, List, Tuple, Union  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/builders/text.py

@@ -24,6 +24,7 @@ if False:
     from typing import Any, Dict, Iterator, Set, Tuple  # NOQA
     from docutils import nodes  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/builders/websupport.py

@@ -13,6 +13,7 @@ if False:
     # For type annotation
     from typing import Any, Dict  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 def setup(app):

sphinx/builders/xml.py

@@ -25,6 +25,7 @@ if False:
     # For type annotation
     from typing import Any, Dict, Iterator, Set  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/cmd/make_mode.py

@@ -29,6 +29,7 @@ from sphinx.util.osutil import cd, rmtree
 if False:
     # For type annotation
     from typing import List  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 BUILDERS = [

sphinx/cmd/quickstart.py

@@ -51,6 +51,7 @@ from sphinx.util.template import SphinxRenderer
 if False:
     # For type annotation
     from typing import Any, Callable, Dict, List, Pattern, Union  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 TERM_ENCODING = getattr(sys.stdin, 'encoding', None)
 

sphinx/config.py

@@ -33,6 +33,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
     from sphinx.util.tags import Tags  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/deprecation.py

@@ -15,6 +15,7 @@ if False:
     # For type annotation
     # note: Don't use typing.TYPE_CHECK here (for py27 and py34).
     from typing import Any, Dict, Type  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class RemovedInSphinx30Warning(PendingDeprecationWarning):

sphinx/directives/__init__.py

@@ -36,6 +36,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.config import Config  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 # RE to strip backslash escapes

sphinx/directives/code.py

@@ -29,6 +29,7 @@ if False:
     from typing import Any, Dict, List, Tuple  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.config import Config  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/directives/other.py

@@ -28,6 +28,7 @@ if False:
     # For type annotation
     from typing import Any, Dict, Generator, List, Tuple  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 glob_re = re.compile(r'.*[*?\[].*')

sphinx/directives/patches.py

@@ -20,6 +20,7 @@ if False:
     # For type annotation
     from typing import Dict, List, Tuple  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class Figure(images.Figure):

sphinx/domains/__init__.py

@@ -24,7 +24,7 @@ if False:
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
     from sphinx.roles import XRefRole  # NOQA
-    from sphinx.util.typing import RoleFunction  # NOQA
+    from sphinx.util.typing import RoleFunction, unicode  # NOQA
 
 
 class ObjType:

sphinx/domains/c.py

@@ -28,6 +28,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 # RE to split at word boundaries

sphinx/domains/changeset.py

@@ -27,6 +27,7 @@ if False:
     from typing import Any, Dict, List  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 versionlabels = {

sphinx/domains/cpp.py

@@ -36,6 +36,7 @@ if False:
     from sphinx.builders import Builder  # NOQA
     from sphinx.config import Config  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/domains/javascript.py

@@ -29,6 +29,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class JSObject(ObjectDescription):

sphinx/domains/math.py

@@ -25,6 +25,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/domains/python.py

@@ -31,6 +31,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/domains/rst.py

@@ -25,6 +25,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 dir_sig_re = re.compile(r'\.\. (.+?)::(.*)$')

sphinx/domains/std.py

@@ -36,7 +36,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
-    from sphinx.util.typing import RoleFunction  # NOQA
+    from sphinx.util.typing import RoleFunction, unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/environment/__init__.py

@@ -40,6 +40,7 @@ if False:
     from sphinx.config import Config  # NOQA
     from sphinx.domains import Domain  # NOQA
     from sphinx.project import Project  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/environment/adapters/asset.py

@@ -12,6 +12,7 @@
 if False:
     # For type annotation
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class ImageAdapter:

sphinx/environment/adapters/indexentries.py

@@ -23,6 +23,7 @@ if False:
     from typing import Any, Dict, Pattern, List, Tuple  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/environment/adapters/toctree.py

@@ -22,6 +22,7 @@ if False:
     from typing import Any, Dict, List  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/environment/collectors/__init__.py

@@ -15,6 +15,7 @@ if False:
     from docutils import nodes  # NOQA
     from sphinx.sphinx import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class EnvironmentCollector:

sphinx/environment/collectors/asset.py

@@ -29,6 +29,7 @@ if False:
     from docutils import nodes  # NOQA
     from sphinx.sphinx import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/environment/collectors/dependencies.py

@@ -23,6 +23,7 @@ if False:
     from docutils import nodes  # NOQA
     from sphinx.sphinx import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class DependenciesCollector(EnvironmentCollector):

sphinx/environment/collectors/indexentries.py

@@ -21,6 +21,7 @@ if False:
     from docutils import nodes  # NOQA
     from sphinx.applicatin import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/environment/collectors/metadata.py

@@ -19,6 +19,7 @@ if False:
     from docutils import nodes  # NOQA
     from sphinx.sphinx import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class MetadataCollector(EnvironmentCollector):

sphinx/environment/collectors/title.py

@@ -20,6 +20,7 @@ if False:
     from docutils import nodes  # NOQA
     from sphinx.sphinx import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class TitleCollector(EnvironmentCollector):

sphinx/environment/collectors/toctree.py

@@ -24,6 +24,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/errors.py

@@ -13,6 +13,7 @@
 if False:
     # For type annotation
     from typing import Any  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class SphinxError(Exception):

sphinx/events.py

@@ -20,6 +20,7 @@ from sphinx.locale import __
 if False:
     # For type annotation
     from typing import Any, Callable, Dict, List  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 # List of all known core events. Maps name to arguments description.

sphinx/ext/apidoc.py

@@ -35,6 +35,7 @@ from sphinx.util.osutil import FileAvoidWrite, ensuredir
 if False:
     # For type annotation
     from typing import Any, List, Tuple  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 # automodule options
 if 'SPHINX_APIDOC_OPTIONS' in os.environ:

sphinx/ext/autodoc/__init__.py

@@ -43,6 +43,7 @@ if False:
     from sphinx.config import Config  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
     from sphinx.ext.autodoc.directive import DocumenterBridge  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/ext/autodoc/directive.py

@@ -24,6 +24,7 @@ if False:
     from sphinx.config import Config  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
     from sphinx.ext.autodoc import Documenter  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/ext/autodoc/importer.py

@@ -22,6 +22,7 @@ from sphinx.util.inspect import isenumclass, safe_getattr
 if False:
     # For type annotation
     from typing import Any, Callable, Dict, Generator, Iterator, List, Optional, Tuple  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/ext/autosectionlabel.py

@@ -27,6 +27,7 @@ if False:
     # For type annotation
     from typing import Any, Dict  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 def register_sections_as_label(app, document):

sphinx/ext/autosummary/__init__.py

@@ -87,6 +87,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
     from sphinx.ext.autodoc import Documenter  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/ext/autosummary/generate.py

@@ -48,6 +48,7 @@ if False:
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
     from sphinx.ext.autodoc import Documenter  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class DummyApplication:

sphinx/ext/coverage.py

@@ -26,6 +26,7 @@ if False:
     # For type annotation
     from typing import Any, Callable, Dict, IO, List, Pattern, Set, Tuple  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/ext/doctest.py

@@ -38,6 +38,7 @@ if False:
     # For type annotation
     from typing import Any, Callable, Dict, IO, Iterable, List, Optional, Sequence, Set, Tuple  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/ext/extlinks.py

@@ -35,6 +35,7 @@ if False:
     from docutils.parsers.rst.states import Inliner  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.util.typing import RoleFunction  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 def make_link_role(base_url, prefix):

sphinx/ext/githubpages.py

@@ -18,6 +18,7 @@ if False:
     from typing import Any, Dict  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 def create_nojekyll(app, env):

sphinx/ext/graphviz.py

@@ -35,6 +35,7 @@ if False:
     from docutils.parsers.rst import Directive  # NOQA
     from typing import Any, Dict, List, Tuple  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/ext/ifconfig.py

@@ -30,6 +30,7 @@ if False:
     # For type annotation
     from typing import Any, Dict, List  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class ifconfig(nodes.Element):

sphinx/ext/imgconverter.py

@@ -21,6 +21,7 @@ if False:
     # For type annotation
     from typing import Any, Dict  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/ext/imgmath.py

@@ -36,6 +36,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.config import Config  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/ext/inheritance_diagram.py

@@ -55,6 +55,7 @@ if False:
     from typing import Any, Dict, List, Tuple, Dict, Optional  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 module_sig_re = re.compile(r'''^(?:([\w.]*)\.)?  # module names

sphinx/ext/intersphinx.py

@@ -49,6 +49,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.config import Config  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
     Inventory = Dict[text_type, Dict[text_type, Tuple[text_type, text_type, text_type, text_type]]]  # NOQA
 

sphinx/ext/jsmath.py

@@ -23,6 +23,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
     from sphinx.writers.html import HTMLTranslator  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 def html_visit_math(self, node):

sphinx/ext/linkcode.py

@@ -20,6 +20,7 @@ if False:
     # For type annotation
     from typing import Any, Dict, Set  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class LinkcodeError(SphinxError):

sphinx/ext/mathbase.py

@@ -26,6 +26,7 @@ if False:
     from typing import Any, Callable, List, Tuple  # NOQA
     from docutils.writers.html4css1 import Writer  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class MathDirective(MathDirectiveBase):

sphinx/ext/mathjax.py

@@ -26,6 +26,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
     from sphinx.writers.html import HTMLTranslator  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 def html_visit_math(self, node):

sphinx/ext/napoleon/__init__.py

@@ -16,6 +16,7 @@ from sphinx.ext.napoleon.docstring import GoogleDocstring, NumpyDocstring
 if False:
     # For type annotation
     from typing import Any, Dict, List  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class Config:

sphinx/ext/napoleon/docstring.py

@@ -25,6 +25,7 @@ if False:
     from typing import Any, Dict, List, Tuple, Type, Union  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.config import Config as SphinxConfig  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 _directive_regex = re.compile(r'\.\. \S+::')

sphinx/ext/todo.py

@@ -29,6 +29,7 @@ if False:
     from typing import Any, Dict, Iterable, List  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/ext/viewcode.py

@@ -29,6 +29,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.config import Config  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/extension.py

@@ -18,6 +18,7 @@ if False:
     from typing import Any, Dict  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.config import Config  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/highlighting.py

@@ -34,6 +34,7 @@ if False:
     # For type annotation
     from typing import Any, Dict  # NOQA
     from pygments.formatter import Formatter  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 logger = logging.getLogger(__name__)

sphinx/io.py

@@ -49,6 +49,7 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 docinfo_re = re.compile(':\\w+:.*?')
 

sphinx/jinja2glue.py

@@ -28,6 +28,7 @@ if False:
     from jinja2.environment import Environment  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.theming import Theme  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 def _tobool(val):

sphinx/locale/__init__.py

@@ -23,6 +23,7 @@ from sphinx.deprecation import RemovedInSphinx30Warning
 if False:
     # For type annotation
     from typing import Any, Callable, Dict, Iterator, List, Tuple  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class _TranslationProxy(UserString):

sphinx/parsers.py

@@ -21,6 +21,7 @@ if False:
     from docutils import nodes  # NOQA
     from docutils.transforms import Transform  # NOQA
     from sphinx.application import Sphinx  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class Parser(docutils.parsers.Parser):

sphinx/project.py

@@ -20,6 +20,7 @@ from sphinx.util.osutil import SEP, relpath
 
 if TYPE_CHECKING:
     from typing import Dict, List, Set  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 EXCLUDE_PATHS = ['**/_sources', '.#*', '**/.#*', '*.lproj/**']  # type: List[unicode]

sphinx/pycode/__init__.py

@@ -23,6 +23,7 @@ from sphinx.util import get_module_source, detect_encoding
 if False:
     # For type annotation
     from typing import Any, Dict, IO, List, Tuple  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class ModuleAnalyzer:

sphinx/pycode/parser.py

@@ -22,6 +22,7 @@ from six import text_type
 if False:
     # For type annotation
     from typing import Any, Dict, IO, List, Tuple  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 comment_re = re.compile(u'^\\s*#: ?(.*)\r?\n?$')
 indent_re = re.compile(u'^\\s*$')
@@ -143,7 +144,7 @@ class TokenProcessor:
         # type: (List[unicode]) -> None
         lines = iter(buffers)
         self.buffers = buffers
-        self.tokens = tokenize.generate_tokens(lambda: next(lines))  # type: ignore  # NOQA
+        self.tokens = tokenize.generate_tokens(lambda: next(lines))  # type: ignore
         self.current = None     # type: Token
         self.previous = None    # type: Token
 

sphinx/registry.py

@@ -43,7 +43,7 @@ if False:
     from sphinx.domains import Domain, Index  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
     from sphinx.ext.autodoc import Documenter  # NOQA
-    from sphinx.util.typing import RoleFunction, TitleGetter  # NOQA
+    from sphinx.util.typing import RoleFunction, TitleGetter, unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 

sphinx/roles.py

@@ -26,7 +26,7 @@ if False:
     from docutils.parsers.rst.states import Inliner  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
-    from sphinx.util.typing import RoleFunction  # NOQA
+    from sphinx.util.typing import RoleFunction, unicode  # NOQA
 
 
 generic_docroles = {

sphinx/search/__init__.py

@@ -26,6 +26,7 @@ if False:
     from typing import Any, Dict, IO, Iterable, List, Tuple, Type, Set  # NOQA
     from docutils import nodes  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class SearchLanguage:

sphinx/search/da.py

@@ -16,6 +16,7 @@ import snowballstemmer
 if False:
     # For type annotation
     from typing import Any  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 danish_stopwords = parse_stop_word(u'''

sphinx/search/de.py

@@ -16,6 +16,7 @@ import snowballstemmer
 if False:
     # For type annotation
     from typing import Any  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 german_stopwords = parse_stop_word(u'''

sphinx/search/en.py

@@ -15,6 +15,7 @@ from sphinx.util.stemmer import get_stemmer
 if False:
     # For type annotation
     from typing import Dict  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 english_stopwords = set(u"""
 a  and  are  as  at

sphinx/search/es.py

@@ -16,6 +16,7 @@ import snowballstemmer
 if False:
     # For type annotation
     from typing import Any  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 spanish_stopwords = parse_stop_word(u'''

sphinx/search/fi.py

@@ -16,6 +16,7 @@ import snowballstemmer
 if False:
     # For type annotation
     from typing import Any  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 finnish_stopwords = parse_stop_word(u'''

sphinx/search/fr.py

@@ -16,6 +16,7 @@ import snowballstemmer
 if False:
     # For type annotation
     from typing import Any  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 french_stopwords = parse_stop_word(u'''

sphinx/search/hu.py

@@ -16,6 +16,7 @@ import snowballstemmer
 if False:
     # For type annotation
     from typing import Any  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 hungarian_stopwords = parse_stop_word(u'''

sphinx/search/it.py

@@ -16,6 +16,7 @@ import snowballstemmer
 if False:
     # For type annotation
     from typing import Any  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 italian_stopwords = parse_stop_word(u'''

sphinx/search/ja.py

@@ -42,6 +42,7 @@ from sphinx.util import import_object
 if False:
     # For type annotation
     from typing import Any, Dict, List  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 class BaseSplitter:

sphinx/search/nl.py

@@ -16,6 +16,7 @@ import snowballstemmer
 if False:
     # For type annotation
     from typing import Any  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 dutch_stopwords = parse_stop_word(u'''

sphinx/search/no.py

@@ -16,6 +16,7 @@ import snowballstemmer
 if False:
     # For type annotation
     from typing import Any  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 norwegian_stopwords = parse_stop_word(u'''

sphinx/search/pt.py

@@ -16,6 +16,7 @@ import snowballstemmer
 if False:
     # For type annotation
     from typing import Any  # NOQA
+    from sphinx.util.typing import unicode  # NOQA
 
 
 portuguese_stopwords = parse_stop_word(u'''