changeset:   89984:31e42208eb99
branch:      3.4
parent:      89980:32407a677215
user:        Ned Deily <nad@acm.org>
date:        Wed Mar 26 23:26:03 2014 -0700
files:       Lib/test/test_urllib2.py
description:
Issue #20939: Backout test_urllib2.test_issue16464 disables:
    68335b8afb1f 3.4
    ad0c75b7bd7d default


diff -r 32407a677215 -r 31e42208eb99 Lib/test/test_urllib2.py
--- a/Lib/test/test_urllib2.py	Tue Mar 25 15:31:50 2014 -0400
+++ b/Lib/test/test_urllib2.py	Wed Mar 26 23:26:03 2014 -0700
@@ -6,10 +6,6 @@
 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 @@
 
     @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/")