[Python-checkins] r86385 - in python/branches/release27-maint: Lib/imaplib.py Lib/test/test_imaplib.py Misc/ACKS Misc/NEWS

[antoine.pitrou]

Author: antoine.pitrou
Date: Wed Nov 10 00:15:18 2010
New Revision: 86385

Log:
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.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/imaplib.py
   python/branches/release27-maint/Lib/test/test_imaplib.py
   python/branches/release27-maint/Misc/ACKS
   python/branches/release27-maint/Misc/NEWS

Modified: python/branches/release27-maint/Lib/imaplib.py
==============================================================================
--- python/branches/release27-maint/Lib/imaplib.py	(original)
+++ python/branches/release27-maint/Lib/imaplib.py	Wed Nov 10 00:15:18 2010
@@ -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()
 
 

Modified: python/branches/release27-maint/Lib/test/test_imaplib.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_imaplib.py	(original)
+++ python/branches/release27-maint/Lib/test/test_imaplib.py	Wed Nov 10 00:15:18 2010
@@ -203,6 +203,7 @@
 
     def test_logout(self):
         rs = self.server.logout()
+        self.server = None
         self.assertEqual(rs[0], 'BYE')
 
 

Modified: python/branches/release27-maint/Misc/ACKS
==============================================================================
--- python/branches/release27-maint/Misc/ACKS	(original)
+++ python/branches/release27-maint/Misc/ACKS	Wed Nov 10 00:15:18 2010
@@ -123,6 +123,7 @@
 Brett Cannon
 Mike Carlton
 Terry Carroll
+Lorenzo M. Catucci
 Donn Cave
 Charles Cazabon
 Per Cederqvist

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Wed Nov 10 00:15:18 2010
@@ -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.