summaryrefslogtreecommitdiff
path: root/setuptools/tests/test_packageindex.py
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2013-06-19 11:45:38 +0100
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2013-06-19 11:45:38 +0100
commit8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc (patch)
tree199a8e4792f87c951fcf82197061c35e5805d100 /setuptools/tests/test_packageindex.py
parent744a61f18bbfcbf7dfaa08886185b4595d8b7bcb (diff)
parent5d9d3930f400a754f38be2a4de21a7f9ed00f5f4 (diff)
downloadpython-setuptools-git-8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc.tar.gz
Merged upstream changes.
--HG-- branch : single-codebase
Diffstat (limited to 'setuptools/tests/test_packageindex.py')
-rw-r--r--setuptools/tests/test_packageindex.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index c2ff0539..92d1e2e0 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -69,7 +69,8 @@ class TestPackageIndex(unittest.TestCase):
try:
index.open_url(url)
except distutils.errors.DistutilsError:
- msg = unicode(sys.exc_info()[1])
+ error = sys.exc_info()[1]
+ msg = unicode(error)
assert 'nonnumeric port' in msg or 'getaddrinfo failed' in msg or 'Name or service not known' in msg
return
raise RuntimeError("Did not raise")