In followup to #1310: Remove more exception indexing.

This commit is contained in:
Georg Brandl 2007-10-22 16:16:13 +00:00
parent b8990aac3a
commit 6464d47195
3 changed files with 9 additions and 7 deletions

View file

@ -120,7 +120,7 @@ def poll(timeout=0.0, map=None):
try:
r, w, e = select.select(r, w, e, timeout)
except select.error as err:
if err[0] != EINTR:
if err.args[0] != EINTR:
raise
else:
return
@ -166,7 +166,7 @@ def poll2(timeout=0.0, map=None):
try:
r = pollster.poll(timeout)
except select.error as err:
if err[0] != EINTR:
if err.args[0] != EINTR:
raise
r = []
for fd, flags in r:

View file

@ -115,8 +115,8 @@ def manage_socket(address):
server = MyRPCServer(address, MyHandler)
break
except socket.error as err:
print("IDLE Subprocess: socket error: "\
+ err[1] + ", retrying....", file=sys.__stderr__)
print("IDLE Subprocess: socket error: " + err.args[1] +
", retrying....", file=sys.__stderr__)
else:
print("IDLE Subprocess: Connection to "\
"IDLE GUI failed, exiting.", file=sys.__stderr__)
@ -131,14 +131,15 @@ def show_socket_error(err, address):
import tkMessageBox
root = Tkinter.Tk()
root.withdraw()
if err[0] == 61: # connection refused
if err.args[0] == 61: # connection refused
msg = "IDLE's subprocess can't connect to %s:%d. This may be due "\
"to your personal firewall configuration. It is safe to "\
"allow this internal connection because no data is visible on "\
"external ports." % address
tkMessageBox.showerror("IDLE Subprocess Error", msg, parent=root)
else:
tkMessageBox.showerror("IDLE Subprocess Error", "Socket Error: %s" % err[1])
tkMessageBox.showerror("IDLE Subprocess Error",
"Socket Error: %s" % err.args[1])
root.destroy()
def print_exception():

View file

@ -637,7 +637,8 @@ class Options:
tokenize.tokenize(fp.readline, eater)
except tokenize.TokenError as e:
print('%s: %s, line %d, column %d' % (
e[0], filename, e[1][0], e[1][1]), file=sys.stderr)
e.args[0], filename, e.args[1][0], e.args[1][1]),
file=sys.stderr)
finally:
if closep:
fp.close()