Skip to content

Commit

Permalink
Fix unconditional usage of requests import
Browse files Browse the repository at this point in the history
On systems that don't have the requests python we cannot catch
this exception.
  • Loading branch information
sbc100 committed Mar 13, 2024
1 parent 5f9ee69 commit ae696a3
Showing 1 changed file with 19 additions and 4 deletions.
23 changes: 19 additions & 4 deletions tools/ports/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,27 @@ def fetch_project(name, url, sha512hash=None):
def retrieve():
# retrieve from remote server
logger.info(f'retrieving port: {name} from {url}')

# Attempt to use the `requests` module rather `urllib`.
# The main difference here is that `requests` will use the `certifi`
# certificate chain whereas `urllib` will use the system openssl
# certificate chain, which can be out-of-date on some macOS systems.
# TODO(sbc): Perhaps we can remove this at some point when we no
# longer support such out-of-date systems.
try:
import requests
response = requests.get(url)
data = response.content
except (ImportError, requests.exceptions.InvalidSchema):
# requests does not support 'file://' protocol and raises InvalidSchema
try:
response = requests.get(url)
data = response.content
except requests.exceptions.InvalidSchema:
# requests does not support 'file://' protocol and raises InvalidSchema
pass
except ImportError:
pass

# If we don't have `requests` or if we got InvalidSchema then fall
# back to `urllib`.
if not data:
from urllib.request import urlopen
f = urlopen(url)
data = f.read()
Expand Down

0 comments on commit ae696a3

Please sign in to comment.