[Python-checkins] r54241 - in sandbox/branches/setuptools-0.6/setuptools: package_index.py tests/test_packageindex.py

[jim.fulton]

Author: jim.fulton
Date: Fri Mar  9 16:56:51 2007
New Revision: 54241

Added:
   sandbox/branches/setuptools-0.6/setuptools/tests/test_packageindex.py   (contents, props changed)
Modified:
   sandbox/branches/setuptools-0.6/setuptools/package_index.py
Log:
Changed setuptools.package_index.PackageIndex.open_url to include the
url in the exception.


Modified: sandbox/branches/setuptools-0.6/setuptools/package_index.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/package_index.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/package_index.py	Fri Mar  9 16:56:51 2007
@@ -581,7 +581,9 @@
             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

Added: sandbox/branches/setuptools-0.6/setuptools/tests/test_packageindex.py
==============================================================================
--- (empty file)
+++ sandbox/branches/setuptools-0.6/setuptools/tests/test_packageindex.py	Fri Mar  9 16:56:51 2007
@@ -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)