Update test to work with latest SSL-enabled URL opening technique.

3 files changed, 68 insertions, 73 deletions

diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
index a725f332..a54d9039 100644
--- a/setuptools.egg-info/dependency_links.txt
+++ b/setuptools.egg-info/dependency_links.txt
@@ -1,7 +1,6 @@
 http://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
 http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
 http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
-http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.3.exe/download#md5=9afe4b75240a8808a24df7a76b6081e3
 http://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
 http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5
 http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 663882d6..29654589 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]

+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm

+rotate = setuptools.command.rotate:rotate

+develop = setuptools.command.develop:develop

+setopt = setuptools.command.setopt:setopt

+build_py = setuptools.command.build_py:build_py

+saveopts = setuptools.command.saveopts:saveopts

+egg_info = setuptools.command.egg_info:egg_info

+register = setuptools.command.register:register

+upload_docs = setuptools.command.upload_docs:upload_docs

+install_egg_info = setuptools.command.install_egg_info:install_egg_info

+alias = setuptools.command.alias:alias

+easy_install = setuptools.command.easy_install:easy_install

+install_scripts = setuptools.command.install_scripts:install_scripts

+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst

+bdist_egg = setuptools.command.bdist_egg:bdist_egg

+install = setuptools.command.install:install

+test = setuptools.command.test:test

+install_lib = setuptools.command.install_lib:install_lib

+build_ext = setuptools.command.build_ext:build_ext

+sdist = setuptools.command.sdist:sdist

+

+[egg_info.writers]

+dependency_links.txt = setuptools.command.egg_info:overwrite_arg

+requires.txt = setuptools.command.egg_info:write_requirements

+PKG-INFO = setuptools.command.egg_info:write_pkg_info

+eager_resources.txt = setuptools.command.egg_info:overwrite_arg

+top_level.txt = setuptools.command.egg_info:write_toplevel_names

+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg

+entry_points.txt = setuptools.command.egg_info:write_entries

+depends.txt = setuptools.command.egg_info:warn_depends_obsolete

+

+[console_scripts]

+easy_install = setuptools.command.easy_install:main

+easy_install-2.7 = setuptools.command.easy_install:main

+

+[setuptools.file_finders]

+svn_cvs = setuptools.command.sdist:_default_revctrl

+

+[distutils.setup_keywords]

+dependency_links = setuptools.dist:assert_string_list

+entry_points = setuptools.dist:check_entry_points

+extras_require = setuptools.dist:check_extras

+use_2to3_exclude_fixers = setuptools.dist:assert_string_list

+package_data = setuptools.dist:check_package_data

+install_requires = setuptools.dist:check_requirements

+use_2to3 = setuptools.dist:assert_bool

+use_2to3_fixers = setuptools.dist:assert_string_list

+include_package_data = setuptools.dist:assert_bool

+exclude_package_data = setuptools.dist:check_package_data

+namespace_packages = setuptools.dist:check_nsp

+test_suite = setuptools.dist:check_test_suite

+eager_resources = setuptools.dist:assert_string_list

+zip_safe = setuptools.dist:assert_bool

+test_loader = setuptools.dist:check_importable

+packages = setuptools.dist:check_packages

+convert_2to3_doctests = setuptools.dist:assert_string_list

+tests_require = setuptools.dist:check_requirements

+

+[setuptools.installation]

+eggsecutable = setuptools.command.easy_install:bootstrap

+

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):
         """