From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 3 Apr 2015 09:06:40 +0000 (+0200)
Subject: Issue #22351: Fix test_nntplib if the ssl module is missing
X-Git-Tag: v3.5.0a4~93^2^2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c9bba07d40f8a86bfa0dc87a4c06f91a07676a6;p=python

Issue #22351: Fix test_nntplib if the ssl module is missing

@unittest.skipUnless(ssl, '...') doesn't work because the class body uses the
nntplib.NNTP_SSL attribute which doesn't exist.
---

diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index 9e88ddbda7..9a8067434c 100644
--- a/Lib/test/test_nntplib.py
+++ b/Lib/test/test_nntplib.py
@@ -1509,15 +1509,16 @@ class MockSocketTests(unittest.TestCase):
             Handler, nntplib.NNTPPermanentError, authinfo_response,
             login, password)
 
-@unittest.skipUnless(ssl, 'requires SSL support')
-class MockSslTests(MockSocketTests):
-    class nntp_class(nntplib.NNTP_SSL):
-        def __init__(self, *pos, **kw):
-            class bypass_context:
-                """Bypass encryption and actual SSL module"""
-                def wrap_socket(sock, **args):
-                    return sock
-            return super().__init__(*pos, ssl_context=bypass_context, **kw)
+if ssl is not None:
+    class MockSslTests(MockSocketTests):
+        class nntp_class(nntplib.NNTP_SSL):
+            def __init__(self, *pos, **kw):
+                class bypass_context:
+                    """Bypass encryption and actual SSL module"""
+                    def wrap_socket(sock, **args):
+                        return sock
+                return super().__init__(*pos, ssl_context=bypass_context, **kw)
+
 
 if __name__ == "__main__":
     unittest.main()