diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-11-10 09:00:43 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-11-10 09:00:43 (GMT) |
| commit | 0a69b856d56860e2dce0ae58e65de57c58a95763 (patch) | |
| tree | b4da9da2f6c4c681c9200c5cea6110b4374eb7a1 /Lib | |
| parent | e87875bfad3ebe18bf87ebd5cbe3db493c34dc1f (diff) | |
| download | cpython-0a69b856d56860e2dce0ae58e65de57c58a95763.zip cpython-0a69b856d56860e2dce0ae58e65de57c58a95763.tar.gz cpython-0a69b856d56860e2dce0ae58e65de57c58a95763.tar.bz2 | |
Merged revisions 86391 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86391 | antoine.pitrou | 2010-11-10 09:59:25 +0100 (mer., 10 nov. 2010) | 4 lines
Followup to r86383: it seems that in some cases (buildbots), the server
closes the connection before we can call shutdown().
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/imaplib.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Lib/imaplib.py b/Lib/imaplib.py index 94f4e8f..77806db 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -22,7 +22,7 @@ Public functions: Internaldate2tuple __version__ = "2.58" -import binascii, random, re, socket, subprocess, sys, time +import binascii, errno, random, re, socket, subprocess, sys, time __all__ = ["IMAP4", "IMAP4_stream", "Internaldate2tuple", "Int2AP", "ParseFlags", "Time2Internaldate"] @@ -260,8 +260,14 @@ class IMAP4: def shutdown(self): """Close I/O established in "open".""" self.file.close() - self.sock.shutdown(socket.SHUT_RDWR) - self.sock.close() + try: + self.sock.shutdown(socket.SHUT_RDWR) + except socket.error as e: + # The server might already have closed the connection + if e.errno != errno.ENOTCONN: + raise + finally: + self.sock.close() def socket(self): |