Issue #22247: Add NNTPError to nntplib.__all__.
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 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 @@
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()
diff --git a/Misc/NEWS b/Misc/NEWS
index 9806e27..1ba6a4a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@
Library
-------
+- Issue #22247: Add NNTPError to nntplib.__all__.
+
- Issue #4180: The warnings registries are now reset when the filters
are modified.