mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-04 14:15:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-30329: Catch Windows error 10022 on shutdown() (#1538) (#1620)

Browse source 
Catch the Windows socket WSAEINVAL error (code 10022) in imaplib and
poplib on shutdown(SHUT_RDWR): An invalid operation was attempted

This error occurs sometimes on SSL connections.
(cherry picked from commit 83a2c28798)
This commit is contained in:
Victor Stinner 2017-05-16 15:29:41 -07:00 • committed by GitHub
parent 0d267041c4
commit aaa0536525
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/imaplib.py
View file

@ -318,9 +318,12 @@ class IMAP4:
self.file.close()
try:
self.sock.shutdown(socket.SHUT_RDWR)
except OSError as e:
# The server might already have closed the connection
if e.errno != errno.ENOTCONN:
except OSError as exc:
# The server might already have closed the connection.
# On Windows, this may result in WSAEINVAL (error 10022):
# An invalid operation was attempted.
if (exc.errno != errno.ENOTCONN
and getattr(exc, 'winerror', 0) != 10022):
raise
finally:
self.sock.close()