mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

8
Lib/idlelib/rpc.py
View file

@ -199,7 +199,7 @@ class SocketIO(object):
raise
except KeyboardInterrupt:
raise
except socket.error:
except OSError:
raise
except Exception as ex:
return ("CALLEXC", ex)
@ -340,7 +340,7 @@ class SocketIO(object):
n = self.sock.send(s[:BUFSIZE])
except (AttributeError, TypeError):
raise IOError("socket no longer exists")
except socket.error:
except OSError:
raise
else:
s = s[n:]
@ -357,7 +357,7 @@ class SocketIO(object):
return None
try:
s = self.sock.recv(BUFSIZE)
except socket.error:
except OSError:
raise EOFError
if len(s) == 0:
raise EOFError
@ -537,7 +537,7 @@ class RPCClient(SocketIO):
SocketIO.__init__(self, working_sock)
else:
print("** Invalid host: ", address, file=sys.__stderr__)
raise socket.error
raise OSError
def get_remote_proxy(self, oid):
return RPCProxy(self, oid)