From 8c9bba07d40f8a86bfa0dc87a4c06f91a07676a6 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 3 Apr 2015 11:06:40 +0200 Subject: [PATCH] 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. --- Lib/test/test_nntplib.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py index 9e88ddbda7b..9a8067434ce 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()