Merge branch 'master' into 5770_doctest_refers_highlight_language

1 files changed, 1 insertions, 2 deletions

diff --git a/sphinx/ext/githubpages.py b/sphinx/ext/githubpages.py
index f11846e08..006d22c5a 100644
--- a/sphinx/ext/githubpages.py
+++ b/sphinx/ext/githubpages.py
@@ -18,7 +18,6 @@ if False:
     from typing import Any, Dict  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
-    from sphinx.util.typing import unicode  # NOQA
 
 
 def create_nojekyll(app, env):
@@ -29,6 +28,6 @@ def create_nojekyll(app, env):
 
 
 def setup(app):
-    # type: (Sphinx) -> Dict[unicode, Any]
+    # type: (Sphinx) -> Dict[str, Any]
     app.connect('env-updated', create_nojekyll)
     return {'version': sphinx.__display_version__, 'parallel_read_safe': True}