diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2010-11-05 19:16:37 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-11-05 19:16:37 (GMT) |
commit | a078115434c58b2dce4cec82f3c2a90711166d60 (patch) | |
tree | 32c7524089fd9e97c4f275c3cff7a6d0a63941d9 /Lib | |
parent | 09fff7a8d185c5b87a979eefb94a2aa462b8a035 (diff) | |
download | cpython-a078115434c58b2dce4cec82f3c2a90711166d60.zip cpython-a078115434c58b2dce4cec82f3c2a90711166d60.tar.gz cpython-a078115434c58b2dce4cec82f3c2a90711166d60.tar.bz2 |
Issue #10282: Add a `nntp_implementation` attribute to NNTP objects.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/nntplib.py | 3 | ||||
-rw-r--r-- | Lib/test/test_nntplib.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Lib/nntplib.py b/Lib/nntplib.py index d5786e2..a09c065 100644 --- a/Lib/nntplib.py +++ b/Lib/nntplib.py @@ -354,6 +354,7 @@ class _NNTPBase: # Inquire about capabilities (RFC 3977) self.nntp_version = 1 + self.nntp_implementation = None try: resp, caps = self.capabilities() except NNTPPermanentError: @@ -365,6 +366,8 @@ class _NNTPBase: # The server can advertise several supported versions, # choose the highest. self.nntp_version = max(map(int, caps['VERSION'])) + if 'IMPLEMENTATION' in caps: + self.nntp_implementation = ' '.join(caps['IMPLEMENTATION']) def getwelcome(self): """Get the welcome message from the server diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py index f9a4cdc..6380084 100644 --- a/Lib/test/test_nntplib.py +++ b/Lib/test/test_nntplib.py @@ -949,6 +949,7 @@ class NNTPv1Tests(NNTPv1v2TestsMixin, MockedNNTPTestsMixin, unittest.TestCase): caps = self.server.getcapabilities() self.assertEqual(caps, {}) self.assertEqual(self.server.nntp_version, 1) + self.assertEqual(self.server.nntp_implementation, None) class NNTPv2Tests(NNTPv1v2TestsMixin, MockedNNTPTestsMixin, unittest.TestCase): @@ -971,6 +972,7 @@ class NNTPv2Tests(NNTPv1v2TestsMixin, MockedNNTPTestsMixin, unittest.TestCase): 'READER': [], }) self.assertEqual(self.server.nntp_version, 3) + self.assertEqual(self.server.nntp_implementation, 'INN 2.5.1') class MiscTests(unittest.TestCase): |