[py_vulcanize] Python 3.12 compatibility tweaks

Bug: chromium:1487454 Change-Id: If8e6fddf0a21ecf5c92e48b3cc0c3ffd7f3d6f9a Reviewed-on: https://chromium-review.googlesource.com/c/catapult/+/5092511 Auto-Submit: Ho Cheung <[email protected]> Reviewed-by: John Chen <[email protected]> Commit-Queue: John Chen <[email protected]>
wab712 · Dec 6, 2023 · 2742d1d · 2742d1d
1 parent 8cf7c46
commit 2742d1d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/common/py_vulcanize/py_vulcanize/html_generation_controller.py b/common/py_vulcanize/py_vulcanize/html_generation_controller.py
@@ -18,7 +18,7 @@ def GetHTMLForStylesheetHRef(self, href):  # pylint: disable=unused-argument
 
   def GetHTMLForInlineStylesheet(self, contents):
     if self.current_module is None:
-      if re.search('url\(.+\)', contents):
+      if re.search(r'url\(.+\)', contents):
         raise Exception(
             'Default HTMLGenerationController cannot handle inline style urls')
       return contents

diff --git a/common/py_vulcanize/py_vulcanize/js_utils.py b/common/py_vulcanize/py_vulcanize/js_utils.py
@@ -4,4 +4,4 @@
 
 
 def EscapeJSIfNeeded(js):
-  return js.replace('</script>', '<\/script>')
+  return js.replace('</script>', r'<\/script>')
diff --git a/common/py_vulcanize/py_vulcanize/parse_html_deps.py b/common/py_vulcanize/py_vulcanize/parse_html_deps.py
@@ -293,6 +293,6 @@ def Parse(self, html):
       html = ''
     else:
       if html.find('< /script>') != -1:
-        raise Exception('Escape script tags with <\/script>')
+        raise Exception(r'Escape script tags with <\/script>')
 
     return HTMLModuleParserResults(html)
diff --git a/common/py_vulcanize/py_vulcanize/style_sheet.py b/common/py_vulcanize/py_vulcanize/style_sheet.py
@@ -60,7 +60,7 @@ def InlineUrl(m):
       return 'url(data:image/%s;base64,%s)' % (ext[1:], data.decode('utf-8'))
 
     # I'm assuming we only have url()'s associated with images
-    return re.sub('url\((?P<quote>"|\'|)(?P<url>[^"\'()]*)(?P=quote)\)',
+    return re.sub(r'url\((?P<quote>"|\'|)(?P<url>[^"\'()]*)(?P=quote)\)',
                   InlineUrl, self.contents)
 
   def AppendDirectlyDependentFilenamesTo(self, dependent_filenames):
@@ -72,7 +72,7 @@ def _Load(self, containing_dirname):
       raise Exception('@imports are not supported')
 
     matches = re.findall(
-        'url\((?:["|\']?)([^"\'()]*)(?:["|\']?)\)',
+        r'url\((?:["|\']?)([^"\'()]*)(?:["|\']?)\)',
         self.contents)
 
     def resolve_url(url):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@


		def EscapeJSIfNeeded(js):
		return js.replace('</script>', '<\/script>')
		return js.replace('</script>', r'<\/script>')