diff options
| author | Jim Fulton <jim@aledade.com> | 2016-04-25 15:18:27 -0400 |
|---|---|---|
| committer | Jim Fulton <jim@aledade.com> | 2016-04-25 15:18:27 -0400 |
| commit | cf470e31326312d68b84b81501b0eb91389042d9 (patch) | |
| tree | a17bfc96917a9583d578d6d926c680834f0d5a9c /ez_setup.py | |
| parent | 005cb1dd7e423160a3af26a41281dbf8ea2cd5b9 (diff) | |
| download | external_python_setuptools-cf470e31326312d68b84b81501b0eb91389042d9.tar.gz external_python_setuptools-cf470e31326312d68b84b81501b0eb91389042d9.tar.bz2 external_python_setuptools-cf470e31326312d68b84b81501b0eb91389042d9.zip | |
Fix setuptools url and curl wants --location to follow redirects
This change also removes:
sys.meta_path = [importer for importer in sys.meta_path if
importer.__class__.__module__ != 'pkg_resources.extern']
from _unload_pkg_resources.
These lines were removed from the version at: https://bootstrap.pypa.io/ez_setup.py
I don't know why the code there and here differs.
Diffstat (limited to 'ez_setup.py')
| -rw-r--r-- | ez_setup.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ez_setup.py b/ez_setup.py index d6f4b78c..46184871 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -33,7 +33,7 @@ except ImportError: LATEST = object() DEFAULT_VERSION = LATEST -DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/" +DEFAULT_URL = "https://pypi.io/packages/source/s/setuptools/" DEFAULT_SAVE_DIR = os.curdir @@ -192,8 +192,6 @@ def _conflict_bail(VC_err, version): def _unload_pkg_resources(): - sys.meta_path = [importer for importer in sys.meta_path if - importer.__class__.__module__ != 'pkg_resources.extern'] del_modules = [ name for name in sys.modules if name.startswith('pkg_resources') @@ -253,7 +251,7 @@ download_file_powershell.viable = has_powershell def download_file_curl(url, target): - cmd = ['curl', url, '--silent', '--output', target] + cmd = ['curl', url, '--location', '--silent', '--output', target] _clean_check(cmd, target) |