aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/package_index.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2006-07-20 20:41:01 +0000
committerPJ Eby <distutils-sig@python.org>2006-07-20 20:41:01 +0000
commitbad362fe5671f2b1567b2f779f57b76edac7f55e (patch)
tree28614a0882273927d7e81c39751ba1610f2ee874 /setuptools/package_index.py
parentfa18a05dd386ba3ec5b5099cfb51b988ea817d41 (diff)
downloadexternal_python_setuptools-bad362fe5671f2b1567b2f779f57b76edac7f55e.tar.gz
external_python_setuptools-bad362fe5671f2b1567b2f779f57b76edac7f55e.tar.bz2
external_python_setuptools-bad362fe5671f2b1567b2f779f57b76edac7f55e.zip
EasyInstall now includes setuptools version information in the
``User-Agent`` string sent to websites it visits. (backport from trunk) --HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4050733
Diffstat (limited to 'setuptools/package_index.py')
-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)