summaryrefslogtreecommitdiff
path: root/Lib/socketserver.py
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-12-18 23:10:48 +0200
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-12-18 23:10:48 +0200
commit0832af6628ca5ac02d0226899725297dd508470b (patch)
treefc4e7d05d9c6f51eb97f3e8abbcab2b226330b94 /Lib/socketserver.py
parentad28c7f9dad791567afa0624acfb3ba430851965 (diff)
downloadcpython-git-0832af6628ca5ac02d0226899725297dd508470b.tar.gz
Issue #16717: get rid of socket.error, replace with OSError
Diffstat (limited to 'Lib/socketserver.py')
-rw-r--r--Lib/socketserver.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 902a5347e1..abc4f02841 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -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)