From 5466e920d9f1df9d0ef5cae6b11ec7250fbbdd1e Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 9 Nov 2010 23:12:32 +0000 Subject: 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. ........ --- Lib/imaplib.py | 1 + Lib/test/test_imaplib.py | 1 + Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 6 insertions(+) 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') diff --git a/Misc/ACKS b/Misc/ACKS index 0311ae9..4a36b6d 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -121,6 +121,7 @@ Tony Campbell Brett Cannon Mike Carlton Terry Carroll +Lorenzo M. Catucci Donn Cave Per Cederqvist Octavian Cerna diff --git a/Misc/NEWS b/Misc/NEWS index 1893860..9f18bbd 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -143,6 +143,9 @@ C-API Library ------- +- Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by + Lorenzo M. Catucci. + - Fix IMAP.login() to work properly. - Issue #10126: Fix distutils' test_build when Python was built with -- cgit v0.12