Issue #20939: Backout test_urllib2.test_issue16464 disables:

    68335b8afb1f 3.4
    ad0c75b7bd7d default

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 0316c3f463603e5326c6bf03a4e8e393d529426a..4b92d6317a070915833eb3cd9248b8d98a05080c 100644 (file)
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -6,10 +6,6 @@ import io
 import socket
 import array
 import sys
-try:
-    import ssl
-except ImportError:
-    ssl = None
 
 import urllib.request
 # The proxy bypass method imported below has logic specific to the OSX
@@ -1442,8 +1438,6 @@ class MiscTests(unittest.TestCase):
 
     @unittest.skipUnless(support.is_resource_enabled('network'),
                          'test requires network access')
-    @unittest.skipIf(ssl is None,
-                     'test requires the ssl module')
     def test_issue16464(self):
         opener = urllib.request.build_opener()
         request = urllib.request.Request("http://www.python.org/~jeremy/")