Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-29 18:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix certifi import error while running ./match bootstrap

Browse source 
Fixes #22590
This commit is contained in:
Shanavas M 2019-01-03 12:15:31 +05:30
parent e68585a26f
commit 1bc8f23232
2 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/servo/devenv_commands.py
View file

@ -26,7 +26,7 @@ from mach.decorators import (
from servo.command_base import CommandBase, cd, call, BIN_SUFFIX from servo.command_base import CommandBase, cd, call, BIN_SUFFIX
from servo.build_commands import notify_build_done from servo.build_commands import notify_build_done
from servo.util import STATIC_RUST_LANG_ORG_DIST, URLOPEN_KWARGS from servo.util import get_static_rust_lang_org_dist, get_urlopen_kwargs
@CommandProvider @CommandProvider
@ -216,8 +216,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 = STATIC_RUST_LANG_ORG_DIST + "/channel-rust-nightly-date.txt" url = get_static_rust_lang_org_dist() + "/channel-rust-nightly-date.txt"
nightly_date = urllib2.urlopen(url, **URLOPEN_KWARGS).read() nightly_date = urllib2.urlopen(url, **get_urlopen_kwargs()).read()
toolchain = "nightly-" + nightly_date toolchain = "nightly-" + nightly_date
filename = path.join(self.context.topdir, "rust-toolchain") filename = path.join(self.context.topdir, "rust-toolchain")
with open(filename, "w") as f: with open(filename, "w") as f:

22
python/servo/util.py
View file

@ -28,14 +28,22 @@ try:
except ImportError: except ImportError:
HAS_SNI = False HAS_SNI = False
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 # The cafile parameter was added in 2.7.9
if HAS_SNI and sys.version_info >= (2, 7, 9): if HAS_SNI_AND_RECENT_PYTHON:
import certifi import certifi
STATIC_RUST_LANG_ORG_DIST = "https://static.rust-lang.org/dist" return {"cafile": certifi.where()}
URLOPEN_KWARGS = {"cafile": certifi.where()} return {}
else:
STATIC_RUST_LANG_ORG_DIST = "https://static-rust-lang-org.s3.amazonaws.com/dist"
URLOPEN_KWARGS = {}
def remove_readonly(func, path, _): def remove_readonly(func, path, _):
@ -96,7 +104,7 @@ def download(desc, src, writer, start_byte=0):
req = urllib2.Request(src) req = urllib2.Request(src)
if start_byte: if start_byte:
req = urllib2.Request(src, headers={'Range': 'bytes={}-'.format(start_byte)}) req = urllib2.Request(src, headers={'Range': 'bytes={}-'.format(start_byte)})
resp = urllib2.urlopen(req, **URLOPEN_KWARGS) resp = urllib2.urlopen(req, **get_urlopen_kwargs())
fsize = None fsize = None
if resp.info().getheader('Content-Length'): if resp.info().getheader('Content-Length'):