From: Ned Deily <nad@acm.org>
Date: Thu, 27 Mar 2014 06:26:03 +0000 (-0700)
Subject: Issue #20939: Backout test_urllib2.test_issue16464 disables:
X-Git-Tag: v3.4.1rc1~177
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e74153a436a844f4606cba80ee6f9e41bd532df4;p=thirdparty%2FPython%2Fcpython.git

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 0316c3f46360..4b92d6317a07 100644
--- 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/")