mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 23:53:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 86383 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Antoine Pitrou 2010-11-09 23:12:32 +00:00
parent 7ec819e3a9
commit 5466e920d9
4 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/imaplib.py
View file

@ -260,6 +260,7 @@ class IMAP4:
def shutdown(self): def shutdown(self):
"""Close I/O established in "open".""" """Close I/O established in "open"."""
self.file.close() self.file.close()
self.sock.shutdown(socket.SHUT_RDWR)
self.sock.close() self.sock.close()

1
Lib/test/test_imaplib.py
View file

@ -220,6 +220,7 @@ class RemoteIMAPTest(unittest.TestCase):
def test_logout(self): def test_logout(self):
rs = self.server.logout() rs = self.server.logout()
self.server = None
self.assertEqual(rs[0], 'BYE') self.assertEqual(rs[0], 'BYE')

1
Misc/ACKS
View file

@ -121,6 +121,7 @@ Tony Campbell
Brett Cannon Brett Cannon
Mike Carlton Mike Carlton
Terry Carroll Terry Carroll
Lorenzo M. Catucci
Donn Cave Donn Cave
Per Cederqvist Per Cederqvist
Octavian Cerna Octavian Cerna

3
Misc/NEWS
View file

@ -143,6 +143,9 @@ C-API
Library Library
------- -------
- Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by
Lorenzo M. Catucci.
- Fix IMAP.login() to work properly. - Fix IMAP.login() to work properly.
- Issue #10126: Fix distutils' test_build when Python was built with - Issue #10126: Fix distutils' test_build when Python was built with