(Merge 3.4) Skip test_urllib2.test_issue16464() is the ssl module is missing
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 4b92d63..0316c3f 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -6,6 +6,10 @@
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
@@ -1438,6 +1442,8 @@
@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/")