Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0832af6

Browse files
asvetlovasvetlov
committed
Issue #16717: get rid of socket.error, replace with OSError
1 parent ad28c7f commit 0832af6

39 files changed

Lines changed: 169 additions & 167 deletions

‎Doc/library/nntplib.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
:mod:`nntplib` --- NNTP protocol client
32
=======================================
43

@@ -71,7 +70,7 @@ The module itself defines the following classes:
7170
reader-specific commands, such as ``group``. If you get unexpected
7271
:exc:`NNTPPermanentError`\ s, you might need to set *readermode*.
7372
:class:`NNTP` class supports the :keyword:`with` statement to
74-
unconditionally consume :exc:`socket.error` exceptions and to close the NNTP
73+
unconditionally consume :exc:`OSError` exceptions and to close the NNTP
7574
connection when done. Here is a sample on how using it:
7675

7776
>>> from nntplib import NNTP

‎Lib/asynchat.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def handle_read (self):
114114

115115
try:
116116
data = self.recv (self.ac_in_buffer_size)
117-
except socket.error as why:
117+
except OSError as why:
118118
self.handle_error()
119119
return
120120

@@ -243,7 +243,7 @@ def initiate_send(self):
243243
# send the data
244244
try:
245245
num_sent = self.send(data)
246-
except socket.error:
246+
except OSError:
247247
self.handle_error()
248248
return
249249

‎Lib/asyncore.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def readwrite(obj, flags):
112112
obj.handle_expt_event()
113113
if flags & (select.POLLHUP | select.POLLERR | select.POLLNVAL):
114114
obj.handle_close()
115-
except socket.error as e:
115+
except OSError as e:
116116
if e.args[0] not in _DISCONNECTED:
117117
obj.handle_error()
118118
else:
@@ -240,7 +240,7 @@ def __init__(self, sock=None, map=None):
240240
# passed be connected.
241241
try:
242242
self.addr = sock.getpeername()
243-
except socket.error as err:
243+
except OSError as err:
244244
if err.args[0] in (ENOTCONN, EINVAL):
245245
# To handle the case where we got an unconnected
246246
# socket.
@@ -304,7 +304,7 @@ def set_reuse_addr(self):
304304
self.socket.getsockopt(socket.SOL_SOCKET,
305305
socket.SO_REUSEADDR) | 1
306306
)
307-
except socket.error:
307+
except OSError:
308308
pass
309309

310310
# ==================================================
@@ -345,15 +345,15 @@ def connect(self, address):
345345
self.addr = address
346346
self.handle_connect_event()
347347
else:
348-
raise socket.error(err, errorcode[err])
348+
raise OSError(err, errorcode[err])
349349

350350
def accept(self):
351351
# XXX can return either an address pair or None
352352
try:
353353
conn, addr = self.socket.accept()
354354
except TypeError:
355355
return None
356-
except socket.error as why:
356+
except OSError as why:
357357
if why.args[0] in (EWOULDBLOCK, ECONNABORTED, EAGAIN):
358358
return None
359359
else:
@@ -365,7 +365,7 @@ def send(self, data):
365365
try:
366366
result = self.socket.send(data)
367367
return result
368-
except socket.error as why:
368+
except OSError as why:
369369
if why.args[0] == EWOULDBLOCK:
370370
return 0
371371
elif why.args[0] in _DISCONNECTED:
@@ -384,7 +384,7 @@ def recv(self, buffer_size):
384384
return b''
385385
else:
386386
return data
387-
except socket.error as why:
387+
except OSError as why:
388388
# winsock sometimes raises ENOTCONN
389389
if why.args[0] in _DISCONNECTED:
390390
self.handle_close()
@@ -399,7 +399,7 @@ def close(self):
399399
self.del_channel()
400400
try:
401401
self.socket.close()
402-
except socket.error as why:
402+
except OSError as why:
403403
if why.args[0] not in (ENOTCONN, EBADF):
404404
raise
405405

@@ -443,7 +443,7 @@ def handle_read_event(self):
443443
def handle_connect_event(self):
444444
err = self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
445445
if err != 0:
446-
raise socket.error(err, _strerror(err))
446+
raise OSError(err, _strerror(err))
447447
self.handle_connect()
448448
self.connected = True
449449
self.connecting = False

‎Lib/distutils/command/upload.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def upload_file(self, command, pyversion, filename):
186186
http.putheader('Authorization', auth)
187187
http.endheaders()
188188
http.send(body)
189-
except socket.error as e:
189+
except OSError as e:
190190
self.announce(str(e), log.ERROR)
191191
return
192192

‎Lib/ftplib.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def __exit__(self, *args):
123123
if self.sock is not None:
124124
try:
125125
self.quit()
126-
except (socket.error, EOFError):
126+
except (OSError, EOFError):
127127
pass
128128
finally:
129129
if self.sock is not None:
@@ -295,7 +295,7 @@ def makeport(self):
295295
try:
296296
sock = socket.socket(af, socktype, proto)
297297
sock.bind(sa)
298-
except socket.error as _:
298+
except OSError as _:
299299
err = _
300300
if sock:
301301
sock.close()
@@ -306,8 +306,8 @@ def makeport(self):
306306
if err is not None:
307307
raise err
308308
else:
309-
raise socket.error("getaddrinfo returns an empty list")
310-
raise socket.error(msg)
309+
raise OSError("getaddrinfo returns an empty list")
310+
raise OSError(msg)
311311
sock.listen(1)
312312
port = sock.getsockname()[1] # Get proper port
313313
host = self.sock.getsockname()[0] # Get proper host

‎Lib/http/client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -791,8 +791,8 @@ def _tunnel(self):
791791

792792
if code != 200:
793793
self.close()
794-
raise socket.error("Tunnel connection failed: %d %s" % (code,
795-
message.strip()))
794+
raise OSError("Tunnel connection failed: %d %s" % (code,
795+
message.strip()))
796796
while True:
797797
line = response.fp.readline(_MAXLINE + 1)
798798
if len(line) > _MAXLINE:

‎Lib/idlelib/PyShell.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ def start_subprocess(self):
393393
try:
394394
self.rpcclt = MyRPCClient(addr)
395395
break
396-
except socket.error as err:
396+
except OSError as err:
397397
pass
398398
else:
399399
self.display_port_binding_error()

‎Lib/idlelib/rpc.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ def localcall(self, seq, request):
199199
raise
200200
except KeyboardInterrupt:
201201
raise
202-
except socket.error:
202+
except OSError:
203203
raise
204204
except Exception as ex:
205205
return ("CALLEXC", ex)
@@ -340,7 +340,7 @@ def putmessage(self, message):
340340
n = self.sock.send(s[:BUFSIZE])
341341
except (AttributeError, TypeError):
342342
raise IOError("socket no longer exists")
343-
except socket.error:
343+
except OSError:
344344
raise
345345
else:
346346
s = s[n:]
@@ -357,7 +357,7 @@ def pollpacket(self, wait):
357357
return None
358358
try:
359359
s = self.sock.recv(BUFSIZE)
360-
except socket.error:
360+
except OSError:
361361
raise EOFError
362362
if len(s) == 0:
363363
raise EOFError
@@ -537,7 +537,7 @@ def accept(self):
537537
SocketIO.__init__(self, working_sock)
538538
else:
539539
print("** Invalid host: ", address, file=sys.__stderr__)
540-
raise socket.error
540+
raise OSError
541541

542542
def get_remote_proxy(self, oid):
543543
return RPCProxy(self, oid)

‎Lib/idlelib/run.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ def manage_socket(address):
135135
try:
136136
server = MyRPCServer(address, MyHandler)
137137
break
138-
except socket.error as err:
139-
print("IDLE Subprocess: socket error: " + err.args[1] +
138+
except OSError as err:
139+
print("IDLE Subprocess: OSError: " + err.args[1] +
140140
", retrying....", file=sys.__stderr__)
141141
socket_error = err
142142
else:

‎Lib/imaplib.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def __init__(self, host = '', port = IMAP4_PORT):
174174
except Exception:
175175
try:
176176
self.shutdown()
177-
except socket.error:
177+
except OSError:
178178
pass
179179
raise
180180

@@ -267,7 +267,7 @@ def shutdown(self):
267267
self.file.close()
268268
try:
269269
self.sock.shutdown(socket.SHUT_RDWR)
270-
except socket.error as e:
270+
except OSError as e:
271271
# The server might already have closed the connection
272272
if e.errno != errno.ENOTCONN:
273273
raise
@@ -899,7 +899,7 @@ def _command(self, name, *args):
899899

900900
try:
901901
self.send(data + CRLF)
902-
except (socket.error, OSError) as val:
902+
except OSError as val:
903903
raise self.abort('socket error: %s' % val)
904904

905905
if literal is None:
@@ -924,7 +924,7 @@ def _command(self, name, *args):
924924
try:
925925
self.send(literal)
926926
self.send(CRLF)
927-
except (socket.error, OSError) as val:
927+
except OSError as val:
928928
raise self.abort('socket error: %s' % val)
929929

930930
if not literator:

0 commit comments

Comments
 (0)