Merge pull request #559 from buildout/master

Fix setuptools url and curl wants --location to follow redirects

Merge pull request #559 from buildout/master
Fix setuptools url and curl wants --location to follow redirects
986a2334 · Jason R. Coombs · 005cb1dd · 3728c541 · 986a2334
Commit 986a2334 authored Apr 25, 2016 by Jason R. Coombs
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ez_setup.py ez_setup.py +2 -2

No files found.
--- 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
@@ -253,7 +253,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)