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

Remove exception indexing in asyncore.

Browse source
This commit is contained in:
Georg Brandl 2008-07-20 07:29:58 +00:00
parent b90f4e8730
commit 61d5c43011
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/asyncore.py
View file

@ -129,7 +129,7 @@ def poll(timeout=0.0, map=None):
try: try:
r, w, e = select.select(r, w, e, timeout) r, w, e = select.select(r, w, e, timeout)
except select.error, err: except select.error, err:
if err[0] != EINTR: if err.args[0] != EINTR:
raise raise
else: else:
return return
@ -175,7 +175,7 @@ def poll2(timeout=0.0, map=None):
try: try:
r = pollster.poll(timeout) r = pollster.poll(timeout)
except select.error, err: except select.error, err:
if err[0] != EINTR: if err.args[0] != EINTR:
raise raise
r = [] r = []
for fd, flags in r: for fd, flags in r:
@ -231,7 +231,7 @@ class dispatcher:
try: try:
self.addr = sock.getpeername() self.addr = sock.getpeername()
except socket.error, err: except socket.error, err:
if err[0] == ENOTCONN: if err.args[0] == ENOTCONN:
# 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
@ -339,7 +339,7 @@ class dispatcher:
conn, addr = self.socket.accept() conn, addr = self.socket.accept()
return conn, addr return conn, addr
except socket.error, why: except socket.error, why:
if why[0] == EWOULDBLOCK: if why.args[0] == EWOULDBLOCK:
pass pass
else: else:
raise raise
@ -349,9 +349,9 @@ class dispatcher:
result = self.socket.send(data) result = self.socket.send(data)
return result return result
except socket.error, why: except socket.error, why:
if why[0] == EWOULDBLOCK: if why.args[0] == EWOULDBLOCK:
return 0 return 0
elif why[0] in (ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED): elif why.args[0] in (ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED):
self.handle_close() self.handle_close()
return 0 return 0
else: else:
@ -369,7 +369,7 @@ class dispatcher:
return data return data
except socket.error, why: except socket.error, why:
# winsock sometimes throws ENOTCONN # winsock sometimes throws ENOTCONN
if why[0] in [ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED]: if why.args[0] in [ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED]:
self.handle_close() self.handle_close()
return '' return ''
else: else:
@ -382,7 +382,7 @@ class dispatcher:
try: try:
self.socket.close() self.socket.close()
except socket.error, why: except socket.error, why:
if why[0] not in (ENOTCONN, EBADF): if why.args[0] not in (ENOTCONN, EBADF):
raise raise
# cheap inheritance, used to pass all other attribute # cheap inheritance, used to pass all other attribute
@ -549,7 +549,7 @@ def close_all(map=None, ignore_all=False):
try: try:
x.close() x.close()
except OSError, x: except OSError, x:
if x[0] == EBADF: if x.args[0] == EBADF:
pass pass
elif not ignore_all: elif not ignore_all:
raise raise