diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2014-09-20 05:53:05 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2014-09-20 05:53:05 (GMT) |
| commit | 96756b6a2712830cdbb29f5eb125b7aef0ee187c (patch) | |
| tree | 011a8f6f424a84e9d4ef2eae1e2a74ffc1985edf | |
| parent | fc4ead24512430c4f55b8b68416b171350e1f986 (diff) | |
| download | cpython-96756b6a2712830cdbb29f5eb125b7aef0ee187c.zip cpython-96756b6a2712830cdbb29f5eb125b7aef0ee187c.tar.gz cpython-96756b6a2712830cdbb29f5eb125b7aef0ee187c.tar.bz2 | |
Issue #22247: Add NNTPError to nntplib.__all__.
| -rw-r--r-- | Lib/nntplib.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_nntplib.py | 17 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 16 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() @@ -32,6 +32,8 @@ Core and Builtins Library ------- +- Issue #22247: Add NNTPError to nntplib.__all__. + - Issue #4180: The warnings registries are now reset when the filters are modified. |