Merge branch 'master' into 5770_doctest_refers_highlight_language

1 files changed, 2 insertions, 3 deletions

diff --git a/sphinx/util/fileutil.py b/sphinx/util/fileutil.py
index df6bd051b..ecce46c76 100644
--- a/sphinx/util/fileutil.py
+++ b/sphinx/util/fileutil.py
@@ -22,11 +22,10 @@ if False:
     from typing import Callable, Dict, Union  # NOQA
     from sphinx.util.matching import Matcher  # NOQA
     from sphinx.util.template import BaseRenderer  # NOQA
-    from sphinx.util.typing import unicode  # NOQA
 
 
 def copy_asset_file(source, destination, context=None, renderer=None):
-    # type: (unicode, unicode, Dict, BaseRenderer) -> None
+    # type: (str, str, Dict, BaseRenderer) -> None
     """Copy an asset file to destination.
 
     On copying, it expands the template variables if context argument is given and
@@ -59,7 +58,7 @@ def copy_asset_file(source, destination, context=None, renderer=None):
 
 
 def copy_asset(source, destination, excluded=lambda path: False, context=None, renderer=None):
-    # type: (unicode, unicode, Union[Callable[[unicode], bool], Matcher], Dict, BaseRenderer) -> None  # NOQA
+    # type: (str, str, Union[Callable[[str], bool], Matcher], Dict, BaseRenderer) -> None
     """Copy asset files to destination recursively.
 
     On copying, it expands the template variables if context argument is given and