Merge branch 'master' into 5770_doctest_refers_highlight_language

1 files changed, 2 insertions, 3 deletions

diff --git a/sphinx/util/docstrings.py b/sphinx/util/docstrings.py
index 5cd12a177..8cd4e5fc5 100644
--- a/sphinx/util/docstrings.py
+++ b/sphinx/util/docstrings.py
@@ -14,11 +14,10 @@ import sys
 if False:
     # For type annotation
     from typing import List  # NOQA
-    from sphinx.util.typing import unicode  # NOQA
 
 
 def prepare_docstring(s, ignore=1):
-    # type: (unicode, int) -> List[unicode]
+    # type: (str, int) -> List[str]
     """Convert a docstring into lines of parseable reST.  Remove common leading
     indentation, where the indentation of a given number of lines (usually just
     one) is ignored.
@@ -52,7 +51,7 @@ def prepare_docstring(s, ignore=1):
 
 
 def prepare_commentdoc(s):
-    # type: (unicode) -> List[unicode]
+    # type: (str) -> List[str]
     """Extract documentation comment lines (starting with #:) and return them
     as a list of lines.  Returns an empty list if there is no documentation.
     """