Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions build/sage_bootstrap/download/transfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
log = logging.getLogger()

from sage_bootstrap.stdio import flush
from sage_bootstrap.compat import urllib
import urllib
from urllib.request import build_opener, install_opener, urlretrieve


class ProgressBar(object):
Expand Down Expand Up @@ -120,16 +121,17 @@ def error_progress_bar(self):
self.progress_bar.error_stop()

def run(self):
opener = urllib.FancyURLopener()
opener = build_opener()
install_opener(opener)

opener.http_error_default = self.http_error_default
self.start_progress_bar()
try:
if self.progress:
filename, info = opener.retrieve(
self.url, self.destination, self.progress_bar)
urlretrieve(self.url, self.destination, reporthook=self.progress_bar)
else:
filename, info = opener.retrieve(
self.url, self.destination)
urlretrieve(self.url, self.destination)

except IOError as error:
self.error_progress_bar()
log.error(error)
Expand Down
2 changes: 1 addition & 1 deletion build/sage_bootstrap/uncompress/tar_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def extractall(self, path='.', members=None, **kwargs):
else name_to_member[m]
for m in members]
return super(SageBaseTarFile, self).extractall(path=path,
members=members,
members=members, filter='fully_trusted',
**kwargs)

def extractbytes(self, member):
Expand Down
Loading