Merge pull request #5773 from tk0miya/fix_typehints_for_unicode

Replace all "unicode" type by "str"

1 files changed, 3 insertions, 4 deletions

diff --git a/sphinx/builders/devhelp.py b/sphinx/builders/devhelp.py
index 901fb5560..cb01667b9 100644
--- a/sphinx/builders/devhelp.py
+++ b/sphinx/builders/devhelp.py
@@ -36,7 +36,6 @@ 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__)
@@ -72,7 +71,7 @@ class DevhelpBuilder(StandaloneHTMLBuilder):
         self.build_devhelp(self.outdir, self.config.devhelp_basename)
 
     def build_devhelp(self, outdir, outname):
-        # type: (unicode, unicode) -> None
+        # type: (str, str) -> None
         logger.info(__('dumping devhelp index...'))
 
         # Basic info
@@ -112,7 +111,7 @@ class DevhelpBuilder(StandaloneHTMLBuilder):
         index = IndexEntries(self.env).create_index(self)
 
         def write_index(title, refs, subitems):
-            # type: (unicode, List[Any], Any) -> None
+            # type: (str, List[Any], Any) -> None
             if len(refs) == 0:
                 pass
             elif len(refs) == 1:
@@ -141,7 +140,7 @@ class DevhelpBuilder(StandaloneHTMLBuilder):
 
 
 def setup(app):
-    # type: (Sphinx) -> Dict[unicode, Any]
+    # type: (Sphinx) -> Dict[str, Any]
     app.setup_extension('sphinx.builders.html')
     app.add_builder(DevhelpBuilder)