Changed setuptools.package_index.PackageIndex.open_url to include the

url in the exception.


git-svn-id: http://svn.python.org/projects/sandbox/trunk/setuptools@54242 6015fed2-1504-0410-9fe1-9d1591cc4771

2 files changed, 22 insertions, 1 deletions

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index e4d7e6b..e4f96f0 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -581,7 +581,9 @@ class PackageIndex(Environment):
             return v
         except urllib2.URLError, v:
             if warning: self.warn(warning, v.reason)
-            else: raise DistutilsError("Download error: %s" % v.reason)
+            else:
+                raise DistutilsError("Download error for %s: %s"
+                                     % (url, v.reason))
 
     def _download_url(self, scheme, url, tmpdir):
         # Determine download filename
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
new file mode 100644
index 0000000..a2ca36a
--- /dev/null
+++ b/setuptools/tests/test_packageindex.py
@@ -0,0 +1,19 @@
+"""Package Index Tests
+"""
+# More would be better!
+
+import os, shutil, tempfile, unittest
+import pkg_resources
+import setuptools.package_index
+
+class TestPackageIndex(unittest.TestCase):
+
+    def test_bad_urls(self):
+        index = setuptools.package_index.PackageIndex()
+        url = 'http://127.0.0.1/nonesuch/test_package_index'
+        try:
+            index.open_url(url)
+        except Exception, v:
+            self.assert_(url in str(v))
+        else:
+            self.assert_(False)