Replace all "unicode" type by "str"

1 files changed, 12 insertions, 13 deletions

diff --git a/sphinx/ext/coverage.py b/sphinx/ext/coverage.py
index fa9fac03b..1d7c87ec5 100644
--- a/sphinx/ext/coverage.py
+++ b/sphinx/ext/coverage.py
@@ -26,20 +26,19 @@ if False:
     # For type annotation
     from typing import Any, Callable, Dict, IO, List, Pattern, Set, Tuple  # NOQA
     from sphinx.application import Sphinx  # NOQA
-    from sphinx.util.typing import unicode  # NOQA
 
 logger = logging.getLogger(__name__)
 
 
 # utility
 def write_header(f, text, char='-'):
-    # type:(IO, unicode, unicode) -> None
+    # type:(IO, str, str) -> None
     f.write(text + '\n')
     f.write(char * len(text) + '\n')
 
 
 def compile_regex_list(name, exps):
-    # type: (unicode, unicode) -> List[Pattern]
+    # type: (str, str) -> List[Pattern]
     lst = []
     for exp in exps:
         try:
@@ -59,19 +58,19 @@ class CoverageBuilder(Builder):
 
     def init(self):
         # type: () -> None
-        self.c_sourcefiles = []  # type: List[unicode]
+        self.c_sourcefiles = []  # type: List[str]
         for pattern in self.config.coverage_c_path:
             pattern = path.join(self.srcdir, pattern)
             self.c_sourcefiles.extend(glob.glob(pattern))
 
-        self.c_regexes = []  # type: List[Tuple[unicode, Pattern]]
+        self.c_regexes = []  # type: List[Tuple[str, Pattern]]
         for (name, exp) in self.config.coverage_c_regexes.items():
             try:
                 self.c_regexes.append((name, re.compile(exp)))
             except Exception:
                 logger.warning(__('invalid regex %r in coverage_c_regexes'), exp)
 
-        self.c_ignorexps = {}  # type: Dict[unicode, List[Pattern]]
+        self.c_ignorexps = {}  # type: Dict[str, List[Pattern]]
         for (name, exps) in self.config.coverage_ignore_c_items.items():
             self.c_ignorexps[name] = compile_regex_list('coverage_ignore_c_items',
                                                         exps)
@@ -83,16 +82,16 @@ class CoverageBuilder(Builder):
                                                 self.config.coverage_ignore_functions)
 
     def get_outdated_docs(self):
-        # type: () -> unicode
+        # type: () -> str
         return 'coverage overview'
 
     def write(self, *ignored):
         # type: (Any) -> None
-        self.py_undoc = {}  # type: Dict[unicode, Dict[unicode, Any]]
+        self.py_undoc = {}  # type: Dict[str, Dict[str, Any]]
         self.build_py_coverage()
         self.write_py_coverage()
 
-        self.c_undoc = {}  # type: Dict[unicode, Set[Tuple[unicode, unicode]]]
+        self.c_undoc = {}  # type: Dict[str, Set[Tuple[str, str]]]
         self.build_c_coverage()
         self.write_c_coverage()
 
@@ -101,7 +100,7 @@ class CoverageBuilder(Builder):
         # Fetch all the info from the header files
         c_objects = self.env.domaindata['c']['objects']
         for filename in self.c_sourcefiles:
-            undoc = set()  # type: Set[Tuple[unicode, unicode]]
+            undoc = set()  # type: Set[Tuple[str, str]]
             with open(filename) as f:
                 for line in f:
                     for key, regex in self.c_regexes:
@@ -156,7 +155,7 @@ class CoverageBuilder(Builder):
                 continue
 
             funcs = []
-            classes = {}  # type: Dict[unicode, List[unicode]]
+            classes = {}  # type: Dict[str, List[str]]
 
             for name, obj in inspect.getmembers(mod):
                 # diverse module attributes are ignored:
@@ -193,7 +192,7 @@ class CoverageBuilder(Builder):
                             classes[name] = []
                             continue
 
-                        attrs = []  # type: List[unicode]
+                        attrs = []  # type: List[str]
 
                         for attr_name in dir(obj):
                             if attr_name not in obj.__dict__:
@@ -267,7 +266,7 @@ class CoverageBuilder(Builder):
 
 
 def setup(app):
-    # type: (Sphinx) -> Dict[unicode, Any]
+    # type: (Sphinx) -> Dict[str, Any]
     app.add_builder(CoverageBuilder)
     app.add_config_value('coverage_ignore_modules', [], False)
     app.add_config_value('coverage_ignore_functions', [], False)