mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Issue #16717: get rid of socket.error, replace with OSError

Browse source
This commit is contained in:
Andrew Svetlov 2012-12-18 23:10:48 +02:00
parent ad28c7f9da
commit 0832af6628
39 changed files with 169 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/socketserver.py
View file

@ -299,7 +299,7 @@ class BaseServer:
"""
try:
request, client_address = self.get_request()
except socket.error:
except OSError:
return
if self.verify_request(request, client_address):
try:
@ -479,7 +479,7 @@ class TCPServer(BaseServer):
#explicitly shutdown. socket.close() merely releases
#the socket and waits for GC to perform the actual close.
request.shutdown(socket.SHUT_WR)
except socket.error:
except OSError:
pass #some platforms may raise ENOTCONN here
self.close_request(request)