diff options
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/nntplib.py | 4 | ||||
-rw-r--r-- | Lib/test/test_nntplib.py | 17 |
2 files changed, 14 insertions, 7 deletions
diff --git a/Lib/nntplib.py b/Lib/nntplib.py index 4ded78a..d33faf8 100644 --- a/Lib/nntplib.py +++ b/Lib/nntplib.py @@ -80,8 +80,8 @@ from email.header import decode_header as _email_decode_header from socket import _GLOBAL_DEFAULT_TIMEOUT __all__ = ["NNTP", - "NNTPReplyError", "NNTPTemporaryError", "NNTPPermanentError", - "NNTPProtocolError", "NNTPDataError", + "NNTPError", "NNTPReplyError", "NNTPTemporaryError", + "NNTPPermanentError", "NNTPProtocolError", "NNTPDataError", "decode_header", ] diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py index 71a4ec0..fb216c1 100644 --- a/Lib/test/test_nntplib.py +++ b/Lib/test/test_nntplib.py @@ -1412,11 +1412,18 @@ class MiscTests(unittest.TestCase): def test_ssl_support(self): self.assertTrue(hasattr(nntplib, 'NNTP_SSL')) -def test_main(): - tests = [MiscTests, NNTPv1Tests, NNTPv2Tests, CapsAfterLoginNNTPv2Tests, - SendReaderNNTPv2Tests, NetworkedNNTPTests, NetworkedNNTP_SSLTests] - support.run_unittest(*tests) +class PublicAPITests(unittest.TestCase): + """Ensures that the correct values are exposed in the public API.""" + + def test_module_all_attribute(self): + self.assertTrue(hasattr(nntplib, '__all__')) + target_api = ['NNTP', 'NNTPError', 'NNTPReplyError', + 'NNTPTemporaryError', 'NNTPPermanentError', + 'NNTPProtocolError', 'NNTPDataError', 'decode_header'] + if ssl is not None: + target_api.append('NNTP_SSL') + self.assertEqual(set(nntplib.__all__), set(target_api)) if __name__ == "__main__": - test_main() + unittest.main() |