From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 9 Nov 2010 23:12:32 +0000 (+0000)
Subject: Merged revisions 86383 via svnmerge from
X-Git-Tag: v3.1.3rc1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5466e920d9f1df9d0ef5cae6b11ec7250fbbdd1e;p=thirdparty%2FPython%2Fcpython.git

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 1b375465af68..e020747e6ce0 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 db07dd577bd6..58e432ae6349 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 0311ae968701..4a36b6dd16f4 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 189386054658..9f18bbd9b4f2 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