Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove old code for out-of-date CA stores (#30031)

Browse source 
This code was written to handle both Python 2 (which we no longer
support) and old Windows CI machines that did not have up-to-date CA
stores. I think we can remove this now.
This commit is contained in:
Martin Robinson 2023-07-27 17:26:22 +02:00 • committed by GitHub
parent b8c04b4bad
commit 17a5b9200d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
python/requirements.txt
View file

@ -25,11 +25,6 @@ colorama == 0.3.7
boto3 == 1.26.127 boto3 == 1.26.127
PyGithub == 1.58.1 PyGithub == 1.58.1
# Default root CAs on Windows CI do not trust CloudFront certificates,
# connecting to https://static.rust-lang.org would fail:
# https://github.com/servo/servo/pull/18942
certifi
# For Python3 compatibility # For Python3 compatibility
six == 1.15 six == 1.15

5
python/servo/devenv_commands.py
View file

@ -23,7 +23,6 @@ from mach.decorators import (
) )
from servo.command_base import CommandBase, cd, call from servo.command_base import CommandBase, cd, call
from servo.util import get_static_rust_lang_org_dist, get_urlopen_kwargs
@CommandProvider @CommandProvider
@ -172,8 +171,8 @@ class MachCommands(CommandBase):
description='Update the Rust version to latest Nightly', description='Update the Rust version to latest Nightly',
category='devenv') category='devenv')
def rustup(self): def rustup(self):
url = get_static_rust_lang_org_dist() + "/channel-rust-nightly-date.txt" nightly_date = urllib.request.urlopen(
nightly_date = urllib.request.urlopen(url, **get_urlopen_kwargs()).read() "https://static.rust-lang.org/dist/channel-rust-nightly-date.txt").read()
toolchain = b"nightly-" + nightly_date toolchain = b"nightly-" + nightly_date
filename = path.join(self.context.topdir, "rust-toolchain") filename = path.join(self.context.topdir, "rust-toolchain")
with open(filename, "wb") as f: with open(filename, "wb") as f:

23
python/servo/util.py
View file

@ -25,29 +25,8 @@ import six
from io import BufferedIOBase, BytesIO from io import BufferedIOBase, BytesIO
from socket import error as socket_error from socket import error as socket_error
try:
from ssl import HAS_SNI
except ImportError:
HAS_SNI = False
SCRIPT_PATH = os.path.abspath(os.path.dirname(__file__)) SCRIPT_PATH = os.path.abspath(os.path.dirname(__file__))
SERVO_ROOT = os.path.abspath(os.path.join(SCRIPT_PATH, "..", "..")) SERVO_ROOT = os.path.abspath(os.path.join(SCRIPT_PATH, "..", ".."))
HAS_SNI_AND_RECENT_PYTHON = HAS_SNI and sys.version_info >= (2, 7, 9)
def get_static_rust_lang_org_dist():
if HAS_SNI_AND_RECENT_PYTHON:
return "https://static.rust-lang.org/dist"
return "https://static-rust-lang-org.s3.amazonaws.com/dist"
def get_urlopen_kwargs():
# The cafile parameter was added in 2.7.9
if HAS_SNI_AND_RECENT_PYTHON:
import certifi
return {"cafile": certifi.where()}
return {}
def remove_readonly(func, path, _): def remove_readonly(func, path, _):
@ -74,7 +53,7 @@ def download(description: str, url: str, writer: BufferedIOBase, start_byte: int
req = urllib.request.Request(url) req = urllib.request.Request(url)
if start_byte: if start_byte:
req = urllib.request.Request(url, headers={'Range': 'bytes={}-'.format(start_byte)}) req = urllib.request.Request(url, headers={'Range': 'bytes={}-'.format(start_byte)})
resp = urllib.request.urlopen(req, **get_urlopen_kwargs()) resp = urllib.request.urlopen(req)
fsize = None fsize = None
if resp.info().get('Content-Length'): if resp.info().get('Content-Length'):