diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-11-09 23:12:32 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-11-09 23:12:32 (GMT) |
| commit | 5466e920d9f1df9d0ef5cae6b11ec7250fbbdd1e (patch) | |
| tree | 4360eb97514770fcf15bc23803d8aa50603e4b10 /Lib | |
| parent | 7ec819e3a9887ac7bfe857ed6b6fb9018dee40c2 (diff) | |
| download | cpython-5466e920d9f1df9d0ef5cae6b11ec7250fbbdd1e.zip cpython-5466e920d9f1df9d0ef5cae6b11ec7250fbbdd1e.tar.gz cpython-5466e920d9f1df9d0ef5cae6b11ec7250fbbdd1e.tar.bz2 | |
Merged revisions 86383 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86383 | antoine.pitrou | 2010-11-10 00:10:33 +0100 (mer., 10 nov. 2010) | 4 lines
Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by
Lorenzo M. Catucci.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/imaplib.py | 1 | ||||
| -rw-r--r-- | Lib/test/test_imaplib.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Lib/imaplib.py b/Lib/imaplib.py index 1b37546..e020747 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -260,6 +260,7 @@ class IMAP4: def shutdown(self): """Close I/O established in "open".""" self.file.close() + self.sock.shutdown(socket.SHUT_RDWR) self.sock.close() diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py index db07dd5..58e432a 100644 --- a/Lib/test/test_imaplib.py +++ b/Lib/test/test_imaplib.py @@ -220,6 +220,7 @@ class RemoteIMAPTest(unittest.TestCase): def test_logout(self): rs = self.server.logout() + self.server = None self.assertEqual(rs[0], 'BYE') |