summaryrefslogtreecommitdiff
path: root/setuptools
diff options
context:
space:
mode:
Diffstat (limited to 'setuptools')
-rwxr-xr-xsetuptools/package_index.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 525f0e73..5bccbb8e 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -141,9 +141,9 @@ def find_external_links(url, page):
if match:
yield urlparse.urljoin(url, match.group(1))
-
-
-
+user_agent = "Python-urllib/%s setuptools/%s" % (
+ urllib2.__version__, require('setuptools')[0].version
+)
@@ -617,13 +617,14 @@ class PackageIndex(Environment):
if url.startswith('file:'):
return local_open(url)
try:
- return urllib2.urlopen(url)
+ request = urllib2.Request(url)
+ request.add_header('User-Agent', user_agent)
+ return urllib2.urlopen(request)
except urllib2.HTTPError, v:
return v
except urllib2.URLError, v:
raise DistutilsError("Download error: %s" % v.reason)
-
def _download_url(self, scheme, url, tmpdir):
# Determine download filename
#
@@ -653,7 +654,6 @@ class PackageIndex(Environment):
else:
return filename
-
def scan_url(self, url):
self.process_url(url, True)