diff --git a/tools/lint/lint.py b/tools/lint/lint.py
index 6a5359bfb8a8772..c56720d9a3f712b 100644
--- a/tools/lint/lint.py
+++ b/tools/lint/lint.py
@@ -652,7 +652,7 @@ def check_python_ast(repo_root, path, f):
def check_global_metadata(value):
# type: (str) -> Iterable[Tuple[Type[rules.Rule], Tuple[Any, ...]]]
- global_values = {item.strip() for item in value.split(b",") if item.strip()}
+ global_values = {item.strip().decode("utf8") for item in value.split(b",") if item.strip()}
# TODO: this could check for duplicates and such
for global_value in global_values:
diff --git a/tools/manifest/sourcefile.py b/tools/manifest/sourcefile.py
index 659a1bb1366b8ca..6f26738a259621a 100644
--- a/tools/manifest/sourcefile.py
+++ b/tools/manifest/sourcefile.py
@@ -56,7 +56,7 @@ def replace_end(s, old, new):
def read_script_metadata(f, regexp):
- # type: (BinaryIO, Pattern[bytes]) -> Iterable[Tuple[bytes, bytes]]
+ # type: (BinaryIO, Pattern[bytes]) -> Iterable[Tuple[Text, Text]]
"""
Yields any metadata (pairs of bytestrings) from the file-like object `f`,
as specified according to a supplied regexp.
@@ -84,7 +84,7 @@ def read_script_metadata(f, regexp):
def get_any_variants(item):
- # type: (bytes) -> Set[bytes]
+ # type: (Text) -> Set[Text]
"""
Returns a set of variants (bytestrings) defined by the given keyword.
"""
@@ -98,7 +98,7 @@ def get_any_variants(item):
def get_default_any_variants():
- # type: () -> Set[bytes]
+ # type: () -> Set[Text]
"""
Returns a set of variants (bytestrings) that will be used by default.
"""
diff --git a/tools/serve/serve.py b/tools/serve/serve.py
index 4bacf65640c22c4..0e5090c2eef80ab 100644
--- a/tools/serve/serve.py
+++ b/tools/serve/serve.py
@@ -178,7 +178,7 @@ class HtmlWrapperHandler(WrapperHandler):
def check_exposure(self, request):
if self.global_type:
- globals = ""
+ globals = u""
for (key, value) in self._get_metadata(request):
if key == "global":
globals = value
@@ -205,7 +205,7 @@ def _script_replacement(self, key, value):
class WorkersHandler(HtmlWrapperHandler):
- global_type = b"dedicatedworker"
+ global_type = "dedicatedworker"
path_replace = [(".any.worker.html", ".any.js", ".any.worker.js"),
(".worker.html", ".worker.js")]
wrapper = """
@@ -234,7 +234,7 @@ class WindowHandler(HtmlWrapperHandler):
class AnyHtmlHandler(HtmlWrapperHandler):
- global_type = b"window"
+ global_type = "window"
path_replace = [(".any.html", ".any.js")]
wrapper = """
@@ -254,7 +254,7 @@ class AnyHtmlHandler(HtmlWrapperHandler):
class SharedWorkersHandler(HtmlWrapperHandler):
- global_type = b"sharedworker"
+ global_type = "sharedworker"
path_replace = [(".any.sharedworker.html", ".any.js", ".any.worker.js")]
wrapper = """
@@ -269,7 +269,7 @@ class SharedWorkersHandler(HtmlWrapperHandler):
class ServiceWorkersHandler(HtmlWrapperHandler):
- global_type = b"serviceworker"
+ global_type = "serviceworker"
path_replace = [(".any.serviceworker.html", ".any.js", ".any.worker.js")]
wrapper = """