From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 13 Oct 2010 11:38:36 +0000 (+0000)
Subject: Let test_ssl fail gracefully if ssl support is not available
X-Git-Tag: v3.2a4~635
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05d936d2cece5ac9dc31a9477c6849e499d2bd5b;p=thirdparty%2FPython%2Fcpython.git

Let test_ssl fail gracefully if ssl support is not available
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index ca74e7132e7a..0c8a8e63b297 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -18,17 +18,12 @@ import weakref
 import platform
 import functools
 
-# Optionally test SSL support, if we have it in the tested platform
-skip_expected = False
-try:
-    import ssl
-except ImportError:
-    skip_expected = True
-else:
-    PROTOCOLS = [
-        ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv3,
-        ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1
-    ]
+ssl = support.import_module("ssl")
+
+PROTOCOLS = [
+    ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv3,
+    ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1
+]
 
 HOST = support.HOST
 
@@ -1489,9 +1484,6 @@ else:
 
 
 def test_main(verbose=False):
-    if skip_expected:
-        raise unittest.SkipTest("No SSL support")
-
     if support.verbose:
         plats = {
             'Linux': platform.linux_distribution,