pythongh-134262: Catch both URLError and ConnectionError in retries (pythonGH-135365)

(cherry picked from commit acc20a8)

Co-authored-by: Emma Smith <emma@emmatyping.dev>

Author: emmatyping

PCbuild/get_external.py

@@ -5,21 +5,22 @@
 import pathlib
 import sys
 import time
+import urllib.error
+import urllib.request
 import zipfile
-from urllib.request import urlretrieve
 
 
 def retrieve_with_retries(download_location, output_path, reporthook,
                           max_retries=7):
     """Download a file with exponential backoff retry and save to disk."""
     for attempt in range(max_retries + 1):
         try:
-            resp = urlretrieve(
+            resp = urllib.request.urlretrieve(
                 download_location,
                 output_path,
                 reporthook=reporthook,
             )
-        except ConnectionError as ex:
+        except (urllib.error.URLError, ConnectionError) as ex:
             if attempt == max_retries:
                 msg = f"Download from {download_location} failed."
                 raise OSError(msg) from ex

Tools/build/generate_sbom.py

@@ -172,7 +172,7 @@ def download_with_retries(download_location: str,
     for attempt in range(max_retries + 1):
         try:
             resp = urllib.request.urlopen(download_location)
-        except urllib.error.URLError as ex:
+        except (urllib.error.URLError, ConnectionError) as ex:
             if attempt == max_retries:
                 msg = f"Download from {download_location} failed."
                 raise OSError(msg) from ex