Merge branch 'master' into 5770_doctest_refers_highlight_language

1 files changed, 4 insertions, 5 deletions

diff --git a/sphinx/ext/todo.py b/sphinx/ext/todo.py
index 00ff00a26..fb5f19e54 100644
--- a/sphinx/ext/todo.py
+++ b/sphinx/ext/todo.py
@@ -31,7 +31,6 @@ if False:
     from typing import Any, Dict, Iterable, List, Tuple  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
-    from sphinx.util.typing import unicode  # NOQA
     from sphinx.writers.html import HTMLTranslator  # NOQA
     from sphinx.writers.latex import LaTeXTranslator  # NOQA
 
@@ -133,7 +132,7 @@ class TodoList(SphinxDirective):
 
 
 def process_todo_nodes(app, doctree, fromdocname):
-    # type: (Sphinx, nodes.document, unicode) -> None
+    # type: (Sphinx, nodes.document, str) -> None
     node = None  # type: nodes.Element
     if not app.config['todo_include_todos']:
         for node in doctree.traverse(todo_node):
@@ -201,7 +200,7 @@ def process_todo_nodes(app, doctree, fromdocname):
 
 
 def purge_todos(app, env, docname):
-    # type: (Sphinx, BuildEnvironment, unicode) -> None
+    # type: (Sphinx, BuildEnvironment, str) -> None
     if not hasattr(env, 'todo_all_todos'):
         return
     env.todo_all_todos = [todo for todo in env.todo_all_todos  # type: ignore
@@ -209,7 +208,7 @@ def purge_todos(app, env, docname):
 
 
 def merge_info(app, env, docnames, other):
-    # type: (Sphinx, BuildEnvironment, Iterable[unicode], BuildEnvironment) -> None
+    # type: (Sphinx, BuildEnvironment, Iterable[str], BuildEnvironment) -> None
     if not hasattr(other, 'todo_all_todos'):
         return
     if not hasattr(env, 'todo_all_todos'):
@@ -247,7 +246,7 @@ def latex_depart_todo_node(self, node):
 
 
 def setup(app):
-    # type: (Sphinx) -> Dict[unicode, Any]
+    # type: (Sphinx) -> Dict[str, Any]
     app.add_event('todo-defined')
     app.add_config_value('todo_include_todos', False, 'html')
     app.add_config_value('todo_link_only', False, 'html')