traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-42427: Use the errno attribute of OSError instead of args[0] (GH-23449)

This commit is contained in:
Serhiy Storchaka 2020-11-22 10:28:34 +02:00 committed by GitHub
parent bd8c22e1fa
commit c4d45ee670
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/asyncore.py
View File

@ -113,7 +113,7 @@ def readwrite(obj, flags):
if flags & (select.POLLHUP | select.POLLERR | select.POLLNVAL): if flags & (select.POLLHUP | select.POLLERR | select.POLLNVAL):
obj.handle_close() obj.handle_close()
except OSError as e: except OSError as e:
if e.args[0] not in _DISCONNECTED: if e.errno not in _DISCONNECTED:
obj.handle_error() obj.handle_error()
else: else:
obj.handle_close() obj.handle_close()
@ -236,7 +236,7 @@ class dispatcher:
try: try:
self.addr = sock.getpeername() self.addr = sock.getpeername()
except OSError as err: except OSError as err:
if err.args[0] in (ENOTCONN, EINVAL): if err.errno in (ENOTCONN, EINVAL):
# To handle the case where we got an unconnected # To handle the case where we got an unconnected
# socket. # socket.
self.connected = False self.connected = False
@ -346,7 +346,7 @@ class dispatcher:
except TypeError: except TypeError:
return None return None
except OSError as why: except OSError as why:
if why.args[0] in (EWOULDBLOCK, ECONNABORTED, EAGAIN): if why.errno in (EWOULDBLOCK, ECONNABORTED, EAGAIN):
return None return None
else: else:
raise raise
@ -358,9 +358,9 @@ class dispatcher:
result = self.socket.send(data) result = self.socket.send(data)
return result return result
except OSError as why: except OSError as why:
if why.args[0] == EWOULDBLOCK: if why.errno == EWOULDBLOCK:
return 0 return 0
elif why.args[0] in _DISCONNECTED: elif why.errno in _DISCONNECTED:
self.handle_close() self.handle_close()
return 0 return 0
else: else:
@ -378,7 +378,7 @@ class dispatcher:
return data return data
except OSError as why: except OSError as why:
# winsock sometimes raises ENOTCONN # winsock sometimes raises ENOTCONN
if why.args[0] in _DISCONNECTED: if why.errno in _DISCONNECTED:
self.handle_close() self.handle_close()
return b'' return b''
else: else:
@ -393,7 +393,7 @@ class dispatcher:
try: try:
self.socket.close() self.socket.close()
except OSError as why: except OSError as why:
if why.args[0] not in (ENOTCONN, EBADF): if why.errno not in (ENOTCONN, EBADF):
raise raise
# log and log_info may be overridden to provide more sophisticated # log and log_info may be overridden to provide more sophisticated
@ -557,7 +557,7 @@ def close_all(map=None, ignore_all=False):
try: try:
x.close() x.close()
except OSError as x: except OSError as x:
if x.args[0] == EBADF: if x.errno == EBADF:
pass pass
elif not ignore_all: elif not ignore_all:
raise raise

2
Lib/smtpd.py
View File

@ -163,7 +163,7 @@ class SMTPChannel(asynchat.async_chat):
# a race condition may occur if the other end is closing # a race condition may occur if the other end is closing
# before we can get the peername # before we can get the peername
self.close() self.close()
if err.args[0] != errno.ENOTCONN: if err.errno != errno.ENOTCONN:
raise raise
return return
print('Peer:', repr(self.peer), file=DEBUGSTREAM) print('Peer:', repr(self.peer), file=DEBUGSTREAM)

4
Lib/socket.py
View File

@ -706,7 +706,7 @@ class SocketIO(io.RawIOBase):
self._timeout_occurred = True self._timeout_occurred = True
raise raise
except error as e: except error as e:
if e.args[0] in _blocking_errnos: if e.errno in _blocking_errnos:
return None return None
raise raise
@ -722,7 +722,7 @@ class SocketIO(io.RawIOBase):
return self._sock.send(b) return self._sock.send(b)
except error as e: except error as e:
# XXX what about EINTR? # XXX what about EINTR?
if e.args[0] in _blocking_errnos: if e.errno in _blocking_errnos:
return None return None
raise raise