aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests/test_packageindex.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-05-19 21:58:08 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-05-19 21:58:08 -0400
commit16e9ae36591d3cdeb2a097f32a6782361b66e0c2 (patch)
treeab9372475a3e2eed68f801ee695d479f63582655 /setuptools/tests/test_packageindex.py
parentc421f1214c90f20710be0a5c4605d10da3bdc896 (diff)
downloadexternal_python_setuptools-16e9ae36591d3cdeb2a097f32a6782361b66e0c2.tar.gz
external_python_setuptools-16e9ae36591d3cdeb2a097f32a6782361b66e0c2.tar.bz2
external_python_setuptools-16e9ae36591d3cdeb2a097f32a6782361b66e0c2.zip
Update test to work with latest SSL-enabled URL opening technique.
Diffstat (limited to 'setuptools/tests/test_packageindex.py')
-rw-r--r--setuptools/tests/test_packageindex.py16
1 files changed, 6 insertions, 10 deletions
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 9c4bfadb..ad856e81 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -46,18 +46,14 @@ class TestPackageIndex(unittest.TestCase):
import httplib
raise httplib.BadStatusLine('line')
- old_urlopen = urllib2.urlopen
- urllib2.urlopen = _urlopen
+ index.opener = _urlopen
url = 'http://example.com'
try:
- try:
- v = index.open_url(url)
- except Exception, v:
- self.assertTrue('line' in str(v))
- else:
- raise AssertionError('Should have raise here!')
- finally:
- urllib2.urlopen = old_urlopen
+ v = index.open_url(url)
+ except Exception, v:
+ self.assertTrue('line' in str(v))
+ else:
+ raise AssertionError('Should have raise here!')
def test_bad_url_double_scheme(self):
"""