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.
........
diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index 8734a84..c8f32a7 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -248,6 +248,7 @@
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 a04ae65..00db29d 100644
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -203,6 +203,7 @@
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 28850b0..4d2d4bb 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -123,6 +123,7 @@
Brett Cannon
Mike Carlton
Terry Carroll
+Lorenzo M. Catucci
Donn Cave
Charles Cazabon
Per Cederqvist
diff --git a/Misc/NEWS b/Misc/NEWS
index d4da0fd..ab8e270 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -69,6 +69,9 @@
Library
-------
+- Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by
+ Lorenzo M. Catucci.
+
- Issue #10126: Fix distutils' test_build when Python was built with
--enable-shared.