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 1b375465af68f42334038be2083493215fe0fc29..e020747e6ce098610f94378930f3424dddae4b3d 100644 (file)
--- 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 db07dd577bd65a9c37fe117f9634cb3b82d49209..58e432ae63497d111f2ffbc75356b1964533f540 100644 (file)
--- 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 0311ae9687013c3240468199db435501e57b095d..4a36b6dd16f4062232e6abb475f0afb9d0d238d2 100644 (file)
--- 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 18938605465852f85ebabd2386b0d8571c1962b0..9f18bbd9b4f25b43a447cd860ae61944fb33e27c 100644 (file)
--- 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