Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/tools/build_release.py b/tools/build_release.py
index c516ec8..02ffcf3 100755
--- a/tools/build_release.py
+++ b/tools/build_release.py
@@ -18,8 +18,8 @@
 import json
 import subprocess
 import sys
-import urllib.error
-import urllib.request
+from six.moves.urllib import error
+from six.moves.urllib import request
 
 
 INFRA_GIT = 'https://chromium.googlesource.com/infra/infra'
@@ -36,8 +36,8 @@
     None if there's no such ref, a gitiles commit URL otherwise.
   """
   try:
-    resp = urllib.request.urlopen('%s/+/%s?format=JSON' % (INFRA_GIT, ref))
-  except urllib.error.HTTPError as exc:
+    resp = request.urlopen('%s/+/%s?format=JSON' % (INFRA_GIT, ref))
+  except error.HTTPError as exc:
     if exc.code == 404:
       return None
     raise