Merge branch 'master' into 5770_doctest_refers_highlight_language

1 files changed, 2 insertions, 3 deletions

diff --git a/sphinx/directives/other.py b/sphinx/directives/other.py
index f5c0cccda..89fdd4df5 100644
--- a/sphinx/directives/other.py
+++ b/sphinx/directives/other.py
@@ -29,14 +29,13 @@ 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'.*[*?\[].*')
 
 
 def int_or_nothing(argument):
-    # type: (unicode) -> int
+    # type: (str) -> int
     if not argument:
         return 999
     return int(argument)
@@ -396,7 +395,7 @@ class Include(BaseInclude, SphinxDirective):
 
 
 def setup(app):
-    # type: (Sphinx) -> Dict[unicode, Any]
+    # type: (Sphinx) -> Dict[str, Any]
     directives.register_directive('toctree', TocTree)
     directives.register_directive('sectionauthor', Author)
     directives.register_directive('moduleauthor', Author)