changeset: 95406:c3e7a670dda2 branch: 3.4 parent: 95403:ca8666310eb3 user: Victor Stinner date: Fri Apr 03 11:06:40 2015 +0200 files: Lib/test/test_nntplib.py description: 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 -r ca8666310eb3 -r c3e7a670dda2 Lib/test/test_nntplib.py --- a/Lib/test/test_nntplib.py Thu Apr 02 23:05:57 2015 +0300 +++ b/Lib/test/test_nntplib.py Fri Apr 03 11:06:40 2015 +0200 @@ -1509,15 +1509,16 @@ 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()