diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2012-05-18 15:43:37 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2012-05-18 15:43:37 -0400 |
| commit | c0cb2ebfddabb15027a036d82702977cb9444651 (patch) | |
| tree | 6f642c49bdf3e5399dc02683a57d167db2b94ada /setuptools/tests/test_packageindex.py | |
| parent | 5132e62a273c53cf5b189e715a3f7d9aad993ea1 (diff) | |
| parent | adc4fbb184e9b410744cc1c91d4832b2235de2a7 (diff) | |
| download | external_python_setuptools-c0cb2ebfddabb15027a036d82702977cb9444651.tar.gz external_python_setuptools-c0cb2ebfddabb15027a036d82702977cb9444651.tar.bz2 external_python_setuptools-c0cb2ebfddabb15027a036d82702977cb9444651.zip | |
Merge
--HG--
branch : distribute
extra : rebase_source : 38f3eb8b52e65c02ab80e32b69bbf0f6ae8f9250
Diffstat (limited to 'setuptools/tests/test_packageindex.py')
| -rw-r--r-- | setuptools/tests/test_packageindex.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py index 1319547b..f10b5ee8 100644 --- a/setuptools/tests/test_packageindex.py +++ b/setuptools/tests/test_packageindex.py @@ -4,6 +4,8 @@ import sys import unittest import urllib2 import pkg_resources +import httplib +import distutils.errors import setuptools.package_index from server import IndexServer @@ -66,8 +68,12 @@ class TestPackageIndex(unittest.TestCase): url = 'http://http://svn.pythonpaste.org/Paste/wphp/trunk' try: index.open_url(url) - except Exception, v: - self.assert_('nonnumeric port' in str(v)) + except distutils.errors.DistutilsError, error: + # Python 2.7.3 + self.assert_('getaddrinfo failed' in str(error)) + except httplib.InvalidURL, error: + # Python 2.7.2 and earlier + self.assert_('nonnumeric port' in str(error)) def test_bad_url_screwy_href(self): index = setuptools.package_index.PackageIndex( |