mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-134262: Catch both URLError and ConnectionError in retries (#135365)

Browse source
This commit is contained in:
Emma Smith 2025-06-17 07:51:23 -04:00 • committed by GitHub
parent 0d582def34
commit acc20a83f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
PCbuild/get_external.py
View file

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

2
Tools/build/generate_sbom.py
View file

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